fix

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

@@ -16,6 +16,48 @@ import java.math.BigDecimal;
 @Setter
 public class TicketRenewUpgradeView {
 
+	/**
+	 * gpt 用户镜像限制次数
+	 */
+	@DbIgnore
+	private Integer gptUserLimitNum;
+
+	/**
+	 * gpt 用户镜像限制时间
+	 */
+	@DbIgnore
+	private Long gptUserLimitTime;
+
+	/**
+	 * luma 用户次数
+	 */
+	@DbIgnore
+	private Integer lumaUserNum;
+
+	/**
+	 * deepseek限制次数
+	 */
+	@DbIgnore
+	private Integer userDsLimitNum;
+
+	/**
+	 * deepseek限制时间
+	 */
+	@DbIgnore
+	private Long userDsLimitTime;
+
+	/**
+	 * 其他模型限制次数
+	 */
+	@DbIgnore
+	private Integer userOtherLimitNum;
+
+	/**
+	 * 其他模型限制时间
+	 */
+	@DbIgnore
+	private Long userOtherLimitTime;
+
 	/**
 	 * 是否是续费升级
 	 */

netflix-service/src/main/java/com/cyksj/service/chatgpt/impl/ChatGptAccountServiceImpl.java

@@ -634,7 +634,7 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
                 UpgradePackage upgradePackage = upgradePackageMapper.selectById(chatgptUser.getPackageId());
                 packagePrice = upgradePackage.getPrice();
             }
-            JSONObject conversationCount = getConversationCount(chatgptUser.getUserToken());
+//            JSONObject conversationCount = getConversationCount(chatgptUser.getUserToken());
 
             ChatGptUserView view = ChatGptUserView.builder()
                     .skuName(goodsDonSku.getSubTitle())
@@ -651,7 +651,7 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
                     .goodsId(goodsDonSku.getGoodsId())
                     .skuId(goodsDonSku.getId())
                     .months(goodsDonSku.getMonths())
-                    .use(Math.min(chatgptUser.getLimitNum(), Optional.ofNullable(conversationCount.getLong("count")).orElse(0L)))
+//                    .use(Math.min(chatgptUser.getLimitNum(), Optional.ofNullable(conversationCount.getLong("count")).orElse(0L)))
                     .packageId(chatgptUser.getPackageId())
                     .packagePrice(packagePrice)
                     .isRenewPackage(chatgptUser.getRenewOrderId() != null ? true : false)
@@ -663,8 +663,8 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
             if (view.getRenewSkuId() != null) {
                 Optional.ofNullable(skuMapper.selectById(view.getRenewSkuId())).ifPresent(renewSuu -> view.setRenewSpecVal(renewSuu.getSpecVal()));
             }
-            view.setOtherUse(Optional.ofNullable(conversationCount.getLong("other")).orElse(0L));
-            view.setDpsUse(Optional.ofNullable(conversationCount.getLong("dps")).orElse(0L));
+//            view.setOtherUse(Optional.ofNullable(conversationCount.getLong("other")).orElse(0L));
+//            view.setDpsUse(Optional.ofNullable(conversationCount.getLong("dps")).orElse(0L));
             return view;
         } else {
             throw BusinessRuntimeException.getInstance("您还未购买该车票");

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

@@ -1862,6 +1862,12 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 							.eq(UpgradePackage::getDeleted, Boolean.TRUE));
 					ticketRenewUpgradeView.setUpgrade(count > 0 ? true : false);
 					ticketRenewUpgradeView.setPackageId(userInfo.getPackageId());
+					ticketRenewUpgradeView.setGptUserLimitNum(userInfo.getLimitNum());
+					ticketRenewUpgradeView.setGptUserLimitTime(userInfo.getLimitTime());
+					ticketRenewUpgradeView.setUserDsLimitNum(userInfo.getDsLimitNum());
+					ticketRenewUpgradeView.setUserDsLimitTime(userInfo.getDsLimitTime());
+					ticketRenewUpgradeView.setUserOtherLimitNum(userInfo.getOtherLimitNum());
+					ticketRenewUpgradeView.setUserOtherLimitTime(userInfo.getOtherLimitTime());
 					if (userInfo.getPackageId() != 0) {
 						UpgradePackage upgradePackage = upgradePackageMapper.selectById(userInfo.getPackageId());
 						ticketRenewUpgradeView.setPackagePrice(upgradePackage.getPrice());