Merge branch 'gpt_new_model'

netflix-dao/src/main/java/com/cyksj/model/entity/ChatgptUser.java

@@ -73,6 +73,30 @@ public class ChatgptUser extends BaseEntity {
      */
     private Long limitTime;
 
+    /**
+     * GPT 高级模型(thinking pro) 次数
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Integer gptThink;
+
+    /**
+     * GPT 高级模型(thinking pro) 限制时间
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Long gptThinkLimitTime;
+
+    /**
+     * 深度研究 次数
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Integer gptDeepStyleLimit;
+
+    /**
+     * 深度研究  限制时间
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Long gptDeepStyleLimitTime;
+
     /**
      * deepseek限制次数
      */

netflix-dao/src/main/java/com/cyksj/model/entity/GoodsDonSku.java

@@ -184,6 +184,30 @@ public class GoodsDonSku extends BaseEntity {
      */
     private Long gptLimitTime;
 
+    /**
+     * GPT 高级模型(thinking pro) 次数
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Integer gptThink;
+
+    /**
+     * GPT 高级模型(thinking pro) 限制时间
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Long gptThinkLimitTime;
+
+    /**
+     * 深度研究 次数
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Integer gptDeepStyleLimit;
+
+    /**
+     * 深度研究  限制时间
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Long gptDeepStyleLimitTime;
+
     /**
      * mj fast次数
      */

netflix-dao/src/main/java/com/cyksj/model/manage/request/ReqGoodsSkuInsert.java

@@ -1,7 +1,5 @@
 package com.cyksj.model.manage.request;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.cyksj.model.entity.GoodsDiscountPlusPurchaseRelation;
 import lombok.Getter;
 import lombok.Setter;
@@ -206,13 +204,11 @@ public class ReqGoodsSkuInsert {
         /**
          * nano总配额次数
          */
-        @TableField(updateStrategy = FieldStrategy.IGNORED)
         private Integer nanoQuota;
 
         /**
          * cc最高约可使用次数
          */
-        @TableField(updateStrategy = FieldStrategy.IGNORED)
         private Integer highestUsage;
 
         /**
@@ -228,16 +224,35 @@ public class ReqGoodsSkuInsert {
         /**
          * 每日预算上限
          */
-        @TableField(updateStrategy = FieldStrategy.IGNORED)
         private Integer openaiDailyLimit;
 
         /**
          * 每月预算上限
          */
-        @TableField(updateStrategy = FieldStrategy.IGNORED)
         private Integer openaiQuota;
 
         private Boolean isDown;
+
+        /**
+         * GPT 高级模型(thinking pro) 次数
+         */
+        private Integer gptThink;
+
+        /**
+         * GPT 高级模型(thinking pro) 限制时间
+         */
+        private Long gptThinkLimitTime;
+
+        /**
+         * 深度研究 次数
+         */
+        private Integer gptDeepStyleLimit;
+
+        /**
+         * 深度研究  限制时间
+         */
+        private Long gptDeepStyleLimitTime;
+
     }
 
 }

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

@@ -59,15 +59,51 @@ public class ChatGptUserView {
      */
     private Long otherLimitTime;
 
+    /**
+     * GPT think 次数
+     */
+    private Integer gptThink;
+
+    /**
+     * GPT think 限制时间
+     */
+    private Long gptThinkLimitTime;
+
+    /**
+     * 深度研究 次数
+     */
+    private Integer gptDeepStyleLimit;
+
+    /**
+     * 深度研究  限制时间
+     */
+    private Long gptDeepStyleLimitTime;
+
     /**
      * 使用次数
      */
     private Long use;
 
+    /**
+     * 其他模型使用次数
+     */
     private Long otherUse;
 
+    /**
+     * dp使用次数
+     */
     private Long dpsUse;
 
+    /**
+     * 高级模型(thinking\pro)使用次数
+     */
+    private Long gptThinkUse;
+
+    /**
+     * 深度研究使用次数
+     */
+    private Long gptDeepStyleUse;
+
     /**
      * 是否可升级套餐
      */

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

@@ -193,6 +193,26 @@ public class GoodsDonSkuFrontView {
 	 */
 	private Long gptLimitTime;
 
+	/**
+	 * GPT think 次数
+	 */
+	private Integer gptThink;
+
+	/**
+	 * GPT think 限制时间
+	 */
+	private Long gptThinkLimitTime;
+
+	/**
+	 * 深度研究 次数
+	 */
+	private Integer gptDeepStyleLimit;
+
+	/**
+	 * 深度研究  限制时间
+	 */
+	private Long gptDeepStyleLimitTime;
+
 
 	/**
 	 * mj fast次数

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

@@ -55,6 +55,30 @@ public class GoodsDonSkuRenewView {
 	@DbField("sku.gpt_limit_time")
 	private Long gptUserLimitTime;
 
+	/**
+	 * GPT 高级模型(thinking pro) 每天次数
+	 */
+	@DbField("sku.gpt_think")
+	private Integer gptThink;
+
+	/**
+	 * GPT 高级模型(thinking pro)限制时间
+	 */
+	@DbField("sku.gpt_think_limit_time")
+	private Long gptThinkLimitTime;
+
+	/**
+	 * 深度研究 每天次数
+	 */
+	@DbField("sku.gpt_deep_style_limit")
+	private Integer gptDeepStyleLimit;
+
+	/**
+	 * 深度研究  限制时间
+	 */
+	@DbField("sku.gpt_deep_style_limit_time")
+	private Long gptDeepStyleLimitTime;
+
 	/**
 	 * deepseek限制次数
 	 */

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

@@ -61,6 +61,30 @@ public class RenewUpgradePackageFrontView {
 		@DbField("sku.gpt_limit_time")
 		private Long gptLimitTime;
 
+		/**
+		 * GPT 高级模型(thinking pro)每天次数
+		 */
+		@DbField("sku.gpt_think")
+		private Integer gptThink;
+
+		/**
+		 * GPT 高级模型(thinking pro)限制时间
+		 */
+		@DbField("sku.gpt_think_limit_time")
+		private Long gptThinkLimitTime;
+
+		/**
+		 * 深度研究 每天次数
+		 */
+		@DbField("sku.gpt_deep_style_limit")
+		private Integer gptDeepStyleLimit;
+
+		/**
+		 * 深度研究  限制时间
+		 */
+		@DbField("sku.gpt_deep_style_limit_time")
+		private Long gptDeepStyleLimitTime;
+
 		/**
 		 * deepseek限制次数
 		 */

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

@@ -456,6 +456,31 @@ public class RenewalView {
     @DbIgnore
     private Long userOtherLimitTime;
 
+
+    /**
+     * GPT think 次数
+     */
+    @DbIgnore
+    private Integer gptThink;
+
+    /**
+     * GPT think 限制时间
+     */
+    @DbIgnore
+    private Long gptThinkLimitTime;
+
+    /**
+     * 深度研究 次数
+     */
+    @DbIgnore
+    private Integer gptDeepStyleLimit;
+
+    /**
+     * 深度研究  限制时间
+     */
+    @DbIgnore
+    private Long gptDeepStyleLimitTime;
+
     /**
      * 镜像token
      */

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

@@ -58,6 +58,26 @@ public class TicketRenewUpgradeView {
 	@DbIgnore
 	private Long userOtherLimitTime;
 
+	/**
+	 * GPT think 次数
+	 */
+	private Integer gptThink;
+
+	/**
+	 * GPT think 限制时间
+	 */
+	private Long gptThinkLimitTime;
+
+	/**
+	 * 深度研究 次数
+	 */
+	private Integer gptDeepStyleLimit;
+
+	/**
+	 * 深度研究  限制时间
+	 */
+	private Long gptDeepStyleLimitTime;
+
 	/**
 	 * 是否是续费升级
 	 */

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

@@ -137,6 +137,30 @@ public class YhShopGoodsSkuFrontView {
 	@DbField("sku.gpt_limit_time")
 	private Long gptLimitTime;
 
+	/**
+	 * GPT 高级模型(thinking pro) 每天次数
+	 */
+	@DbField("sku.gpt_think")
+	private Integer gptThink;
+
+	/**
+	 * GPT 高级模型(thinking pro)限制时间
+	 */
+	@DbField("sku.gpt_think_limit_time")
+	private Long gptThinkLimitTime;
+
+	/**
+	 * 深度研究 每天次数
+	 */
+	@DbField("sku.gpt_deep_style_limit")
+	private Integer gptDeepStyleLimit;
+
+	/**
+	 * 深度研究  限制时间
+	 */
+	@DbField("sku.gpt_deep_style_limit_time")
+	private Long gptDeepStyleLimitTime;
+
 	@DbField("sku.is_car")
 	private Boolean isCar;
 

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

@@ -329,6 +329,11 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
             chatgptUser.setDsLimitNum(goodsDonSku.getDsLimitNum());
             chatgptUser.setOtherLimitNum(goodsDonSku.getOtherLimitNum());
             chatgptUser.setOtherLimitTime(goodsDonSku.getOtherLimitTime());
+
+            chatgptUser.setGptThink(goodsDonSku.getGptThink());
+            chatgptUser.setGptThinkLimitTime(goodsDonSku.getGptThinkLimitTime());
+            chatgptUser.setGptDeepStyleLimit(goodsDonSku.getGptDeepStyleLimit());
+            chatgptUser.setGptDeepStyleLimitTime(goodsDonSku.getGptDeepStyleLimitTime());
         }
         try {
             chatgptUser.setExpireTime(groupsRelation.getExpiryTime());
@@ -372,6 +377,11 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
             chatgptUser.setDsLimitTime(goodsDonSku.getDsLimitTime());
             chatgptUser.setOtherLimitNum(goodsDonSku.getOtherLimitNum());
             chatgptUser.setOtherLimitTime(goodsDonSku.getOtherLimitTime());
+
+            chatgptUser.setGptThink(goodsDonSku.getGptThink());
+            chatgptUser.setGptThinkLimitTime(goodsDonSku.getGptThinkLimitTime());
+            chatgptUser.setGptDeepStyleLimit(goodsDonSku.getGptDeepStyleLimit());
+            chatgptUser.setGptDeepStyleLimitTime(goodsDonSku.getGptDeepStyleLimitTime());
         }
         try {
             chatgptUser.setExpireTime(DateUtil.offsetMonth(DateTime.now(), goodsDonSku.getMonths()));
@@ -648,6 +658,10 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
                     .dsLimitTime(chatgptUser.getDsLimitTime())
                     .otherLimitNum(chatgptUser.getOtherLimitNum())
                     .otherLimitTime(chatgptUser.getOtherLimitTime())
+                    .gptThink(chatgptUser.getGptThink())
+                    .gptThinkLimitTime(chatgptUser.getGptThinkLimitTime())
+                    .gptDeepStyleLimit(chatgptUser.getGptDeepStyleLimit())
+                    .gptDeepStyleLimitTime(chatgptUser.getGptDeepStyleLimitTime())
                     .upgrade(upgrade)
                     .orderId(orderId)
                     .goodsId(goodsDonSku.getGoodsId())
@@ -667,6 +681,10 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
             }
             view.setOtherUse(Optional.ofNullable(conversationCount.getLong("other")).orElse(0L));
             view.setDpsUse(Optional.ofNullable(conversationCount.getLong("dps")).orElse(0L));
+
+            //gpt think已使用次数
+            view.setGptThinkUse(Optional.ofNullable(conversationCount.getLong("gptThinkCount")).orElse(0L));
+            view.setGptDeepStyleUse(Optional.ofNullable(conversationCount.getLong("deepResearchCount")).orElse(0L));
             return view;
         } else {
             throw BusinessRuntimeException.getInstance("您还未购买该车票");
@@ -686,6 +704,10 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
                     .dsLimitTime(chatgptUser.getDsLimitTime())
                     .otherLimitNum(chatgptUser.getOtherLimitNum())
                     .otherLimitTime(chatgptUser.getOtherLimitTime())
+                    .gptThink(chatgptUser.getGptThink())
+                    .gptThinkLimitTime(chatgptUser.getGptThinkLimitTime())
+                    .gptDeepStyleLimit(chatgptUser.getGptDeepStyleLimit())
+                    .gptDeepStyleLimitTime(chatgptUser.getGptDeepStyleLimitTime())
                     .use(getConversationCount(chatgptUser.getUserToken(), chatgptUser.getLimitTime()))
                     .build();
         } else {
@@ -923,6 +945,11 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
             chatgptUser.setDsLimitTime(goodsDonSku.getDsLimitTime());
             chatgptUser.setOtherLimitNum(goodsDonSku.getOtherLimitNum());
             chatgptUser.setOtherLimitTime(goodsDonSku.getOtherLimitTime());
+
+            chatgptUser.setGptThink(goodsDonSku.getGptThink());
+            chatgptUser.setGptThinkLimitTime(goodsDonSku.getGptThinkLimitTime());
+            chatgptUser.setGptDeepStyleLimit(goodsDonSku.getGptDeepStyleLimit());
+            chatgptUser.setGptDeepStyleLimitTime(goodsDonSku.getGptDeepStyleLimitTime());
         }
         try {
             DateTime dateTime = DateUtil.offsetMonth(new Date(), 1);

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

@@ -423,6 +423,12 @@ public class MirrorUserCleatServiceImpl implements MirrorUserCleatService {
 			chatgptUser.setDsLimitTime(finalSku.getDsLimitTime());
 			chatgptUser.setOtherLimitNum(finalSku.getOtherLimitNum());
 			chatgptUser.setOtherLimitTime(finalSku.getOtherLimitTime());
+
+			chatgptUser.setGptThink(finalSku.getGptThink());
+			chatgptUser.setGptThinkLimitTime(finalSku.getGptThinkLimitTime());
+			chatgptUser.setGptDeepStyleLimit(finalSku.getGptDeepStyleLimit());
+			chatgptUser.setGptDeepStyleLimitTime(finalSku.getGptDeepStyleLimitTime());
+
 			chatgptUser.setRenewExpiryTime(renewExpiryTime);
 			chatgptUserMapper.updateById(chatgptUser);
 			log.info("还原镜像gptuser套餐成功");

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

@@ -5228,6 +5228,11 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 					chatgptUser.setDsLimitNum(sku.getDsLimitNum());
 					chatgptUser.setOtherLimitTime(sku.getOtherLimitTime());
 					chatgptUser.setOtherLimitNum(sku.getOtherLimitNum());
+
+					chatgptUser.setGptThink(sku.getGptThink());
+					chatgptUser.setGptThinkLimitTime(sku.getGptThinkLimitTime());
+					chatgptUser.setGptDeepStyleLimit(sku.getGptDeepStyleLimit());
+					chatgptUser.setGptDeepStyleLimitTime(sku.getGptDeepStyleLimitTime());
 					//记录续费升级过期的时间
 					chatgptUser.setRenewExpiryTime(newDate);
 					chatgptUser.setRenewOrderId(order.getId());

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

@@ -757,6 +757,12 @@ public class VipOrderDonServiceImpl extends ServiceImpl<VipOrderDonMapper, VipOr
 				chatgptUser.setDsLimitTime(sku.getDsLimitTime());
 				chatgptUser.setOtherLimitNum(sku.getOtherLimitNum());
 				chatgptUser.setOtherLimitTime(sku.getOtherLimitTime());
+
+				chatgptUser.setGptThink(sku.getGptThink());
+				chatgptUser.setGptThinkLimitTime(sku.getGptThinkLimitTime());
+				chatgptUser.setGptDeepStyleLimit(sku.getGptDeepStyleLimit());
+				chatgptUser.setGptDeepStyleLimitTime(sku.getGptDeepStyleLimitTime());
+
 				chatgptUser.setPackageId(0l);
 				chatgptUser.setClearPackageTime(null);
 				chatgptUser.setRenewOrderId(0l);

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

@@ -2113,6 +2113,10 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 					ticketRenewUpgradeView.setUserDsLimitTime(userInfo.getDsLimitTime());
 					ticketRenewUpgradeView.setUserOtherLimitNum(userInfo.getOtherLimitNum());
 					ticketRenewUpgradeView.setUserOtherLimitTime(userInfo.getOtherLimitTime());
+					ticketRenewUpgradeView.setGptThink(userInfo.getGptThink());
+					ticketRenewUpgradeView.setGptThinkLimitTime(userInfo.getGptThinkLimitTime());
+					ticketRenewUpgradeView.setGptDeepStyleLimit(userInfo.getGptDeepStyleLimit());
+					ticketRenewUpgradeView.setGptDeepStyleLimitTime(userInfo.getGptDeepStyleLimitTime());
 					if (userInfo.getPackageId() != 0) {
 						UpgradePackage upgradePackage = upgradePackageMapper.selectById(userInfo.getPackageId());
 						ticketRenewUpgradeView.setPackagePrice(upgradePackage.getPrice());
@@ -2495,6 +2499,10 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				ticket.setUserDsLimitTime(userInfo.getDsLimitTime());
 				ticket.setUserOtherLimitNum(userInfo.getOtherLimitNum());
 				ticket.setUserOtherLimitTime(userInfo.getOtherLimitTime());
+				ticket.setGptThink(userInfo.getGptThink());
+				ticket.setGptThinkLimitTime(userInfo.getGptThinkLimitTime());
+				ticket.setGptDeepStyleLimit(userInfo.getGptDeepStyleLimit());
+				ticket.setGptDeepStyleLimitTime(userInfo.getGptDeepStyleLimitTime());
 				ticket.setUserToken(userInfo.getUserToken());
 				ticket.setUse(userInfo.getUse());
 				ticket.setModel(userInfo.getModel());