fix

netflix-dao/src/main/java/com/cyksj/model/views/RenewalView.java

@@ -217,18 +217,6 @@ public class RenewalView {
     @DbIgnore
     private Integer mjUserRelaxNum;
 
-    /**
-     * gpt镜像限制次数
-     */
-    @DbField("sku.gpt_limit_num")
-    private Integer gptLimitNum;
-
-    /**
-     * gpt镜像限制时间
-     */
-    @DbField("sku.gpt_limit_time")
-    private Integer gptLimitTime;
-
     /**
      * gpt 用户镜像限制次数
      */
@@ -245,7 +233,7 @@ public class RenewalView {
     private Long use;
 
     /**
-     * 可升级
+     * 是否可升级套餐 （标准，专业）
      */
     @DbIgnore
     private Boolean upgrade;

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -3242,7 +3242,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				if (chatgptUser == null) {
 					throw BusinessRuntimeException.getInstance("车票未激活gpt账号,请先激活");
 				}
-				if (chatgptUser.getLimitNum() > goodsDonSku.getGptLimitNum()) {
+				if (chatgptUser.getLimitNum() >= upgradePackage.getNum()) {
 					throw BusinessRuntimeException.getInstance("您已升级车票套餐");
 				}
 				Date expiryTime = groupsRelation.getExpiryTime();

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

@@ -267,7 +267,9 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				ticket.setGptUserLimitNum(userInfo.getLimitNum());
 				ticket.setGptUserLimitTime(userInfo.getLimitTime());
 				ticket.setUse(userInfo.getUse());
-				Integer count = upgradePackageMapper.selectCount(Wrappers.lambdaQuery(UpgradePackage.class).apply("JSON_CONTAINS(sku_ids,'\"" + ticket.getSkuId() + "\"')").eq(UpgradePackage::getStatus, Boolean.TRUE));
+				Integer count = upgradePackageMapper.selectCount(Wrappers.lambdaQuery(UpgradePackage.class).apply("JSON_CONTAINS(sku_ids,'\"" + ticket.getSkuId() + "\"')")
+						.gt(UpgradePackage::getNum, userInfo.getLimitNum())
+						.eq(UpgradePackage::getStatus, Boolean.TRUE));
 				ticket.setUpgrade(count > 0 ? true : false);
 			}
 			List<GroupsRelationUserView> relationUserViews = groupsRelationMapper.getUserRelationUserViews(ticket.getGroupId(), ticket.getRelationId(), ticket.getUserId(), List.of(GroupsRelation.Status.validity, GroupsRelation.Status.outside));