fix

netflix-service/src/main/java/com/cyksj/service/mange/CmsOrderDonService.java

@@ -57,6 +57,4 @@ public interface CmsOrderDonService extends IService<OrderDon> {
 	void refundPriceDiffer(OrderRefundReq orderRefundReq) throws Exception;
 
 	void clearBalanceToRefundMoney(OrderBalanceRefundReq refundReq) throws Exception;
-
-	void delMirrorUser(Long goodsId, Long relationId);
 }

netflix-service/src/main/java/com/cyksj/service/mange/MirrorUserCleatService.java

@@ -0,0 +1,11 @@
+package com.cyksj.service.mange;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: MirrorUserCleatService
+ * 创建者: JavaZou
+ * 创建时间:2024/6/27 11:15
+ */
+public interface MirrorUserCleatService {
+	void delMirrorUser(Long goodsId, Long relationId);
+}

netflix-service/src/main/java/com/cyksj/service/mange/impl/CmsOrderDonServiceImpl.java

@@ -51,6 +51,7 @@ import com.cyksj.service.coupon.CouponFontService;
 import com.cyksj.service.distribute.equipment.EquipmentDistributeService;
 import com.cyksj.service.giftcard.GiftCardOrderUseRecordService;
 import com.cyksj.service.mange.CmsOrderDonService;
+import com.cyksj.service.mange.MirrorUserCleatService;
 import com.cyksj.service.mange.stock.GoodsDonStockService;
 import com.cyksj.service.market.MarketFrontService;
 import com.cyksj.service.order.OrderCommonService;
@@ -193,6 +194,8 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
 
     private final AccountMapper accountMapper;
 
+    private final MirrorUserCleatService mirrorUserCleatService;
+
     private static final GlobalThreadPoolTaskExecutor TASK_POOL = GlobalThreadPoolTaskExecutor.getInstance();
 
     @Override
@@ -693,11 +696,6 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
         relation.setNewRelationId(newRelation.getId());
         relationClearService.clearTicket(relation, source);
 
-        //是否是GPT镜像规格
-        if (orderDon.getOrderType() == 1) {
-            delMirrorUser(orderDon.getGoodsId(), orderDon.getRelationId());
-        }
-
         //奈飞车票
         if (orderDon.getGoodsId() == 1) {
             User user = userMapper.selectById(newRelation.getUserId());
@@ -1059,7 +1057,7 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
             }
             //是否是GPT镜像规格
             if (orderDon.getOrderType() == 1) {
-                delMirrorUser(orderDon.getGoodsId(), orderDon.getRelationId());
+                mirrorUserCleatService.delMirrorUser(orderDon.getGoodsId(), orderDon.getRelationId());
             }
             //是否是分销订单
             //处理下级渠道分销提成
@@ -1337,30 +1335,4 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
         }
         return relation;
     }
-
-    /**
-     * 删除gptUser
-     */
-    @Override
-    public void delMirrorUser(Long goodsId, Long relationId) {
-        //gpt镜像
-        if (goodsId != null && goodsId == 18) {
-            Integer selectCount = chatgptUserMapper.selectCount(Wrappers.lambdaQuery(ChatgptUser.class)
-                    .eq(ChatgptUser::getRelationId, relationId));
-            if (selectCount > 0) {
-                chatgptUserMapper.delete(Wrappers.lambdaQuery(ChatgptUser.class)
-                        .eq(ChatgptUser::getRelationId, relationId));
-            }
-        }
-        //mj镜像
-        if (goodsId != null && goodsId == 26) {
-            MidjourneyUser user = midjourneyUserMapper.selectOne(Wrappers.lambdaQuery(MidjourneyUser.class)
-                    .eq(MidjourneyUser::getRelationId, relationId).last("limit 1"));
-            if (user != null) {
-                midjourneyUserMapper.delete(Wrappers.lambdaQuery(MidjourneyUser.class)
-                        .eq(MidjourneyUser::getRelationId, relationId));
-                redisService.del(RedisService.key.MIDJOURNEY_USER.getName() + user.getUserToken());
-            }
-        }
-    }
 }

netflix-service/src/main/java/com/cyksj/service/mange/impl/MirrorUserCleatServiceImpl.java

@@ -0,0 +1,49 @@
+package com.cyksj.service.mange.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyksj.mapper.ChatgptUserMapper;
+import com.cyksj.mapper.MidjourneyUserMapper;
+import com.cyksj.model.entity.ChatgptUser;
+import com.cyksj.model.entity.MidjourneyUser;
+import com.cyksj.redis.RedisService;
+import com.cyksj.service.mange.MirrorUserCleatService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: MirrorUserCleatServiceImpl
+ * 创建者: JavaZou
+ * 创建时间:2024/6/27 11:15
+ */
+@Service
+@RequiredArgsConstructor
+public class MirrorUserCleatServiceImpl implements MirrorUserCleatService {
+	private final ChatgptUserMapper chatgptUserMapper;
+
+	private final MidjourneyUserMapper midjourneyUserMapper;
+
+	private final RedisService redisService;
+	@Override
+	public void delMirrorUser(Long goodsId, Long relationId) {
+		//gpt镜像
+		if (goodsId != null && goodsId == 18) {
+			Integer selectCount = chatgptUserMapper.selectCount(Wrappers.lambdaQuery(ChatgptUser.class)
+					.eq(ChatgptUser::getRelationId, relationId));
+			if (selectCount > 0) {
+				chatgptUserMapper.delete(Wrappers.lambdaQuery(ChatgptUser.class)
+						.eq(ChatgptUser::getRelationId, relationId));
+			}
+		}
+		//mj镜像
+		if (goodsId != null && goodsId == 26) {
+			MidjourneyUser user = midjourneyUserMapper.selectOne(Wrappers.lambdaQuery(MidjourneyUser.class)
+					.eq(MidjourneyUser::getRelationId, relationId).last("limit 1"));
+			if (user != null) {
+				midjourneyUserMapper.delete(Wrappers.lambdaQuery(MidjourneyUser.class)
+						.eq(MidjourneyUser::getRelationId, relationId));
+				redisService.del(RedisService.key.MIDJOURNEY_USER.getName() + user.getUserToken());
+			}
+		}
+	}
+}

netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationClearServiceImpl.java

@@ -8,6 +8,7 @@ import com.cyksj.model.entity.GoodsDonSku;
 import com.cyksj.model.entity.GroupsRelation;
 import com.cyksj.model.entity.UserTicketClearedRecord;
 import com.cyksj.model.manage.views.GroupsRelationView;
+import com.cyksj.service.mange.MirrorUserCleatService;
 import com.cyksj.service.relation.GroupRelationClearService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.util.MapUtils;
@@ -38,6 +39,8 @@ public class GroupRelationClearServiceImpl implements GroupRelationClearService
 
 	private final GoodsDonSkuMapper goodsDonSkuMapper;
 
+	private final MirrorUserCleatService mirrorUserCleatService;
+
 	@Override
 	@Transactional(rollbackFor = Throwable.class)
 	public void clearTicket(GroupsRelation relation, UserTicketClearedRecord.Source source) {
@@ -125,6 +128,7 @@ public class GroupRelationClearServiceImpl implements GroupRelationClearService
 //						log.info("ChatGPT 独立会员账号车票过期,删除原先车队id:{}并生成一个10人月付规格的车队id:{}", groupsRelation.getId(), gt.getId());
 //					}
 //				}
+				mirrorUserCleatService.delMirrorUser(groupsRelation.getGoodsId(), groupsRelation.getId());
 			}
 		}
 	}

netflix-web/src/main/java/com/cyksj/web/controller/external/ExternalController.java

@@ -20,7 +20,7 @@ import com.cyksj.model.entity.OrderDon;
 import com.cyksj.model.request.ExchangeCodeReq;
 import com.cyksj.model.views.ExternalExchangeCodeView;
 import com.cyksj.service.exchange.ExchangeCodeService;
-import com.cyksj.service.mange.CmsOrderDonService;
+import com.cyksj.service.mange.MirrorUserCleatService;
 import com.cyksj.service.order.OrderCommonService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
@@ -57,7 +57,7 @@ public class ExternalController {
 
 	private final ExchangeCodeService exchangeCodeService;
 
-	private final CmsOrderDonService cmsOrderDonService;
+	private final MirrorUserCleatService mirrorUserCleatService;
 
 	/**
 	 * 知乎 特殊镜像规格 兑换码列表
@@ -117,7 +117,7 @@ public class ExternalController {
 
 				//清除gtpUser
 				if (orderDon.getOrderType() == 1) {
-					cmsOrderDonService.delMirrorUser(goodsDon.getId(), orderDon.getRelationId());
+					mirrorUserCleatService.delMirrorUser(goodsDon.getId(), orderDon.getRelationId());
 				}
 
 				//重新生成兑换码