Merge branch 'renew_upgrade' into pre

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

@@ -37,7 +37,7 @@ public class MirrorUserCleatServiceImpl implements MirrorUserCleatService {
 
 	private final UserBindRelationService userBindRelationService;
 
-	private final UpgradeOrderDonMapper upgradeOrderDonMapper;
+	private final UpgradePackageMapper upgradePackageMapper;
 
 	private final GroupsRelationMapper groupsRelationMapper;
 
@@ -94,13 +94,8 @@ public class MirrorUserCleatServiceImpl implements MirrorUserCleatService {
 			//是否存在套餐升级包
 			Long packageId = chatgptUser.getPackageId();
 			if (packageId != null && packageId != 0) {
-				UpgradeOrderDon upgradeOrderDon = upgradeOrderDonMapper.selectOne(Wrappers.lambdaQuery(UpgradeOrderDon.class)
-						.eq(UpgradeOrderDon::getRelationId, chatgptUser.getRelationId())
-						.in(UpgradeOrderDon::getUserId, userIdList)
-						.eq(UpgradeOrderDon::getPackageId, chatgptUser.getPackageId())
-						.orderByDesc(UpgradeOrderDon::getId)
-						.last("limit 1"));
-				Long upgradeOrderDonSkuId = upgradeOrderDon.getSkuId();
+				UpgradePackage upgradePackage = upgradePackageMapper.selectById(chatgptUser.getPackageId());
+				Long upgradeOrderDonSkuId = upgradePackage.getUpgradeSkuId();
 				upgradeOrderDonSku = skuMapper.selectById(upgradeOrderDonSkuId);
 			}
 			//套餐升级