fix

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

@@ -1088,7 +1088,7 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
             giftCardUserRecordMapper.updateById(giftCardUserRecord);
         }
         //校验续费升级规格
-        checkMirrorRenewSku(orderDon);
+//        checkMirrorRenewSku(orderDon);
     }
 
     /**

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

@@ -161,12 +161,13 @@ public class MirrorUserCleatServiceImpl implements MirrorUserCleatService {
 			Date renewExpiryTime = null;
 			Integer oriCodePoints = claudeCodeUser.getCodePoints();
 			claudeCodeUser.setOriCodePoints(oriCodePoints);
+			//当前续费订单id
+			Long presentUserCodePackageOrderId = claudeCodeUser.getRenewOrderId();
 			claudeCodeUser.setRenewSkuId(null);
 			claudeCodeUser.setRenewOrderId(null);
 			if (renewExpiryRecord != null) {
-				Long renewOrderId = renewExpiryRecord.getOrderId();
 				//当前续费
-				OrderDon presentRenewOrderDon = orderDonMapper.selectById(renewOrderId);
+				OrderDon presentRenewOrderDon = orderDonMapper.selectById(presentUserCodePackageOrderId);
 				//是否存在其他续费升级
 				ClaudeCodeUserRenewExpiryRecord otherRenewRecord = claudeCodeUserRenewExpiryRecordMapper.getOtherRenewSku(orderDon.getId(), relation.getId(), userIdList);
 				GoodsDonSku otherRenewSku = null;
@@ -190,7 +191,6 @@ public class MirrorUserCleatServiceImpl implements MirrorUserCleatService {
 				}
 			}
 			//非当前套餐续费订单id 不修改claudeCode
-			Long presentUserCodePackageOrderId = claudeCodeUser.getRenewOrderId();
 			if (!ObjectUtil.equal(presentUserCodePackageOrderId, orderId)) {
 				return;
 			}
@@ -238,6 +238,8 @@ public class MirrorUserCleatServiceImpl implements MirrorUserCleatService {
 				otherRenewSku = skuMapper.selectById(otherRenewOrderDon.getSkuId());
 			}
 			Date renewExpiryTime = null;
+			//当前续费订单id
+			Long presentUserCodePackageOrderId = claudeUser.getRenewOrderId();
 			claudeUser.setRenewSkuId(null);
 			claudeUser.setRenewOrderId(null);
 			//续费升级
@@ -256,7 +258,6 @@ public class MirrorUserCleatServiceImpl implements MirrorUserCleatService {
 				claudeUser.setRenewSkuId(otherRenewOrderDon.getSkuId());
 			}
 			//非当前套餐续费订单id 不修改user
-			Long presentUserCodePackageOrderId = claudeUser.getRenewOrderId();
 			if (!ObjectUtil.equal(presentUserCodePackageOrderId, orderId)) {
 				return;
 			}
@@ -303,6 +304,8 @@ public class MirrorUserCleatServiceImpl implements MirrorUserCleatService {
 				log.info("GPT续费升级订单退款,relation_id:{}存在套餐升级", orderDon.getUserId());
 				finalSku = upgradeOrderDonSku;
 			}
+			//当前续费订单id
+			Long presentUserCodePackageOrderId = chatgptUser.getRenewOrderId();
 			chatgptUser.setRenewSkuId(null);
 			chatgptUser.setRenewOrderId(null);
 			//续费升级
@@ -328,7 +331,6 @@ public class MirrorUserCleatServiceImpl implements MirrorUserCleatService {
 				chatgptUser.setRenewSkuId(otherRenewOrderDon.getSkuId());
 			}
 			//非当前套餐续费订单id 不修改user
-			Long presentUserCodePackageOrderId = chatgptUser.getRenewOrderId();
 			if (!ObjectUtil.equal(presentUserCodePackageOrderId, orderId)) {
 				return;
 			}