zoujiajian před 2 roky
rodič
revize
d81e1fcc4f

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

@@ -1376,10 +1376,12 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
                     .eq(ChatgptUser::getRelationId, orderDon.getRelationId())
                     .last("limit 1"));
             Long presentRenewSkuId = chatgptUser.getRenewSkuId();
-            //存在不同升级套餐
-            GoodsDonSku presentRenewSku = skuMapper.selectById(presentRenewSkuId);
-            if (!ObjectUtil.equal(presentRenewSkuId, skuId)) {
-                throw BusinessRuntimeException.getInstance("请先退掉用户目前续费升级的{0}规格", presentRenewSku.getSpecVal());
+            if (presentRenewSkuId != null) {
+                //存在不同升级套餐
+                GoodsDonSku presentRenewSku = skuMapper.selectById(presentRenewSkuId);
+                if (!ObjectUtil.equal(presentRenewSkuId, skuId)) {
+                    throw BusinessRuntimeException.getInstance("请先退掉用户目前续费升级的{0}规格", presentRenewSku.getSpecVal());
+                }
             }
         }
     }

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

@@ -78,8 +78,9 @@ public class MirrorUserCleatServiceImpl implements MirrorUserCleatService {
 					.eq(ChatgptUser::getRelationId, orderDon.getRelationId())
 					.last("limit 1"));
 			Long presentRenewSkuId = chatgptUser.getRenewSkuId();
-			//存在不同升级套餐
-			GoodsDonSku presentRenewSku = skuMapper.selectById(presentRenewSkuId);
+			if (presentRenewSkuId == null) {
+				return;
+			}
 			GroupsRelation relation = groupsRelationMapper.selectById(orderDon.getRelationId());
 			GroupsTrips groupsTrips = groupsMapper.selectById(relation.getGroupsId());
 			GoodsDonSku finalSku = skuMapper.selectById(groupsTrips.getSkuId());