zoujiajian 1 год назад
Родитель
Сommit
90086ee7e3

+ 4 - 4
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("您还未购买该车票");

+ 1 - 1
netflix-service/src/main/java/com/cyksj/service/claude/impl/ClaudeServiceImpl.java

@@ -82,7 +82,7 @@ public class ClaudeServiceImpl implements ClaudeService {
                     .isRenewPackage(claudeUser.getRenewOrderId() != null ? true : false)
                     .renewSkuId(claudeUser.getRenewSkuId())
                     .renewOrderId(claudeUser.getRenewOrderId())
-//                    .use(Math.min(claudeUser.getLimitNum(), getConversationCount(claudeUser.getUserToken(), claudeUser.getLimitTime())))
+                    .use(Math.min(claudeUser.getLimitNum(), getConversationCount(claudeUser.getUserToken(), claudeUser.getLimitTime())))
                     .build();
             if (view.getRenewSkuId() != null) {
                 Optional.ofNullable(skuMapper.selectById(view.getRenewSkuId())).ifPresent(renewSku -> view.setRenewSpecVal(renewSku.getSpecVal()));