fix

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

@@ -479,7 +479,7 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
                         //低级套餐
                         GoodsDonSku secondSkuUpGrade = goodsDonSkuMapper.selectById(secondUpgrade.getSkuId());
                         //续费升级套餐更高
-                        if (renewSku.getMonths() >= secondSkuUpGrade.getMonths() && renewSku.getNum() >= secondSkuUpGrade.getNum()) {
+                        if (renewSku.getMonths() >= secondSkuUpGrade.getMonths() && renewSku.getGptLimitNum() >= secondSkuUpGrade.getGptLimitNum() && renewSku.getGptLimitTime() <= secondSkuUpGrade.getGptLimitTime()) {
                             gptLimitTime = renewSku.getGptLimitTime();
                             gptLimitNum = renewSku.getGptLimitNum();
                         }

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

@@ -120,7 +120,7 @@ public class MirrorUserCleatServiceImpl implements MirrorUserCleatService {
 					log.info("续费升级订单退款,relation_id:{}存在次级续费升级订单", orderDon.getUserId());
 					if (upgradeOrderDonSku != null) {
 						//套餐升级高于其他续费升级
-						if (upgradeOrderDonSku.getMonths() >= otherRenewSku.getMonths() && upgradeOrderDonSku.getNum() >= otherRenewSku.getNum()) {
+						if (upgradeOrderDonSku.getMonths() >= otherRenewSku.getMonths() && upgradeOrderDonSku.getGptLimitNum() >= otherRenewSku.getGptLimitNum() && upgradeOrderDonSku.getGptLimitTime() <= otherRenewSku.getGptLimitTime()) {
 							log.info("续费升级订单退款,relation_id:{}存在更高级套餐升级", orderDon.getUserId());
 							finalSku = upgradeOrderDonSku;
 						}

netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

@@ -47,6 +47,7 @@ import com.cyksj.service.user.UserService;
 import com.cyksj.web.util.StpUserUtil;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
+import com.ejlchina.searcher.operator.LessEqual;
 import com.ejlchina.searcher.param.Operator;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
@@ -61,6 +62,7 @@ import java.math.RoundingMode;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 
 /**
@@ -885,7 +887,7 @@ public class GroupRelationController {
      */
     @GetMapping("/get/renew/skus/{relationId}/{skuId}")
     public Result<List<RenewUpgradePackageFrontView>> getRenewSkus(@PathVariable Long relationId, @PathVariable Long skuId) {
-        long userId = StpUserUtil.getLoginIdAsLong();
+        long userId = 234191;
         List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
         ChatgptUser chatgptUser = chatgptUserMapper.selectOne(Wrappers.lambdaQuery(ChatgptUser.class)
                 .eq(ChatgptUser::getRelationId, relationId));
@@ -894,7 +896,8 @@ public class GroupRelationController {
         Long renewSkuId = chatgptUser.getRenewSkuId();
         GoodsDonSku sku = goodsDonSkuMapper.selectById(skuId);
         AtomicInteger minMonths = new AtomicInteger(sku.getMonths());
-        AtomicInteger minNum = new AtomicInteger(sku.getGptLimitNum());
+        AtomicInteger minNum = new AtomicInteger(chatgptUser.getLimitNum());
+        AtomicLong minTime = new AtomicLong(chatgptUser.getLimitTime());
         if (renewSkuId != null) {
             GoodsDonSku presentRenew = goodsDonSkuMapper.selectById(renewSkuId);
             minMonths.set(presentRenew.getMonths());
@@ -912,9 +915,6 @@ public class GroupRelationController {
                 if (upgradeSku.getMonths() > minMonths.get()) {
                     minMonths.set(upgradeSku.getMonths());
                 }
-                if (upgradeSku.getNum() > minNum.get()) {
-                    minNum.set(upgradeSku.getNum());
-                }
             }
         }
         List<RenewUpgradePackageFrontView> renewUpgradePackageFrontViews = beanSearcher.searchAll(RenewUpgradePackageFrontView.class, MapUtils.builder().field(RenewUpgradePackageFrontView::getSkuId, skuId).build());
@@ -923,6 +923,7 @@ public class GroupRelationController {
                 List<RenewUpgradePackageFrontView.RenewSkuView> renewSkuViews = beanSearcher.searchAll(RenewUpgradePackageFrontView.RenewSkuView.class, MapUtils.builder()
                         .field(RenewUpgradePackageFrontView.RenewSkuView::getMonths, minMonths.get()).op(Operator.GreaterEqual)
                         .field(RenewUpgradePackageFrontView.RenewSkuView::getGptLimitNum, minNum.get()).op(Operator.GreaterEqual)
+                        .field(RenewUpgradePackageFrontView.RenewSkuView::getGptLimitTime, minTime.get()).op(LessEqual.class)
                         .field(RenewUpgradePackageFrontView.RenewSkuView::getSkuId, Jsons.parseList(renew.getUpgradeSkuIds(), Long.class)).op(Operator.InList)
                         .build());
                 renew.setRenewSkus(renewSkuViews);