fix

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

@@ -74,23 +74,41 @@ public class ChatgptUser extends BaseEntity {
     private Long limitTime;
 
     /**
-     * GPT think 每天次数
+     * GPT think 次数
      */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer gptThink;
 
     /**
-     * GPT5 Thinking Pro 每天次数
+     * GPT think 限制时间
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Long gptThinkLimitTime;
+
+    /**
+     * GPT5 Thinking Pro 次数
      */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer gptProThink;
 
     /**
-     * 深度研究 每天次数
+     * GPT5 Thinking Pro 限制时间
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Long gptProThinkLimitTime;
+
+    /**
+     * 深度研究 次数
      */
     @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

@@ -185,23 +185,41 @@ public class GoodsDonSku extends BaseEntity {
     private Long gptLimitTime;
 
     /**
-     * GPT think 每天次数
+     * GPT think 次数
      */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer gptThink;
 
     /**
-     * GPT5 Thinking Pro 每天次数
+     * GPT think 限制时间
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Long gptThinkLimitTime;
+
+    /**
+     * GPT5 Thinking Pro 次数
      */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer gptProThink;
 
     /**
-     * 深度研究 每天次数
+     * GPT5 Thinking Pro 限制时间
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Long gptProThinkLimitTime;
+
+    /**
+     * 深度研究 次数
      */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer gptDeepStyleLimit;
 
+    /**
+     * 深度研究  限制时间
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Long gptDeepStyleLimitTime;
+
     /**
      * mj fast次数
      */

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

@@ -60,20 +60,35 @@ public class ChatGptUserView {
     private Long otherLimitTime;
 
     /**
-     * GPT think 每天次数
+     * GPT think 次数
      */
     private Integer gptThink;
 
     /**
-     * GPT5 Thinking Pro 每天次数
+     * GPT think 限制时间
+     */
+    private Long gptThinkLimitTime;
+
+    /**
+     * GPT5 Thinking Pro 次数
      */
     private Integer gptProThink;
 
     /**
-     * 深度研究 每天次数
+     * GPT5 Thinking Pro 限制时间
+     */
+    private Long gptProThinkLimitTime;
+
+    /**
+     * 深度研究 次数
      */
     private Integer gptDeepStyleLimit;
 
+    /**
+     * 深度研究  限制时间
+     */
+    private Long gptDeepStyleLimitTime;
+
     /**
      * 使用次数
      */

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

@@ -194,20 +194,35 @@ public class GoodsDonSkuFrontView {
 	private Long gptLimitTime;
 
 	/**
-	 * GPT think 每天次数
+	 * GPT think 次数
 	 */
 	private Integer gptThink;
 
 	/**
-	 * GPT5 Thinking Pro 每天次数
+	 * GPT think 限制时间
+	 */
+	private Long gptThinkLimitTime;
+
+	/**
+	 * GPT5 Thinking Pro 次数
 	 */
 	private Integer gptProThink;
 
 	/**
-	 * 深度研究 每天次数
+	 * GPT5 Thinking Pro 限制时间
+	 */
+	private Long gptProThinkLimitTime;
+
+	/**
+	 * 深度研究 次数
 	 */
 	private Integer gptDeepStyleLimit;
 
+	/**
+	 * 深度研究  限制时间
+	 */
+	private Long gptDeepStyleLimitTime;
+
 
 	/**
 	 * mj fast次数

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

@@ -458,23 +458,41 @@ public class RenewalView {
 
 
     /**
-     * GPT think 每天次数
+     * GPT think 次数
      */
     @DbIgnore
     private Integer gptThink;
 
     /**
-     * GPT5 Thinking Pro 每天次数
+     * GPT think 限制时间
+     */
+    @DbIgnore
+    private Long gptThinkLimitTime;
+
+    /**
+     * GPT5 Thinking Pro 次数
      */
     @DbIgnore
     private Integer gptProThink;
 
     /**
-     * 深度研究 每天次数
+     * GPT5 Thinking Pro 限制时间
+     */
+    @DbIgnore
+    private Long gptProThinkLimitTime;
+
+    /**
+     * 深度研究 次数
      */
     @DbIgnore
     private Integer gptDeepStyleLimit;
 
+    /**
+     * 深度研究  限制时间
+     */
+    @DbIgnore
+    private Long gptDeepStyleLimitTime;
+
     /**
      * 镜像token
      */

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

@@ -143,18 +143,36 @@ public class YhShopGoodsSkuFrontView {
 	@DbField("sku.gpt_think")
 	private Integer gptThink;
 
+	/**
+	 * GPT think 限制时间
+	 */
+	@DbField("sku.gpt_think_limit_time")
+	private Long gptThinkLimitTime;
+
 	/**
 	 * GPT5 Thinking Pro 每天次数
 	 */
 	@DbField("sku.gpt_pro_think")
 	private Integer gptProThink;
 
+	/**
+	 * GPT5 Thinking Pro 限制时间
+	 */
+	@DbField("sku.gpt_pro_think_limit_time")
+	private Long gptProThinkLimitTime;
+
 	/**
 	 * 深度研究 每天次数
 	 */
 	@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

@@ -331,8 +331,11 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
             chatgptUser.setOtherLimitTime(goodsDonSku.getOtherLimitTime());
 
             chatgptUser.setGptThink(goodsDonSku.getGptThink());
+            chatgptUser.setGptThinkLimitTime(goodsDonSku.getGptThinkLimitTime());
             chatgptUser.setGptProThink(goodsDonSku.getGptProThink());
+            chatgptUser.setGptProThinkLimitTime(goodsDonSku.getGptProThinkLimitTime());
             chatgptUser.setGptDeepStyleLimit(goodsDonSku.getGptDeepStyleLimit());
+            chatgptUser.setGptDeepStyleLimitTime(goodsDonSku.getGptDeepStyleLimitTime());
         }
         try {
             chatgptUser.setExpireTime(groupsRelation.getExpiryTime());
@@ -378,8 +381,11 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
             chatgptUser.setOtherLimitTime(goodsDonSku.getOtherLimitTime());
 
             chatgptUser.setGptThink(goodsDonSku.getGptThink());
+            chatgptUser.setGptThinkLimitTime(goodsDonSku.getGptThinkLimitTime());
             chatgptUser.setGptProThink(goodsDonSku.getGptProThink());
+            chatgptUser.setGptProThinkLimitTime(goodsDonSku.getGptProThinkLimitTime());
             chatgptUser.setGptDeepStyleLimit(goodsDonSku.getGptDeepStyleLimit());
+            chatgptUser.setGptDeepStyleLimitTime(goodsDonSku.getGptDeepStyleLimitTime());
         }
         try {
             chatgptUser.setExpireTime(DateUtil.offsetMonth(DateTime.now(), goodsDonSku.getMonths()));
@@ -657,8 +663,11 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
                     .otherLimitNum(chatgptUser.getOtherLimitNum())
                     .otherLimitTime(chatgptUser.getOtherLimitTime())
                     .gptThink(chatgptUser.getGptThink())
+                    .gptThinkLimitTime(chatgptUser.getGptThinkLimitTime())
                     .gptProThink(chatgptUser.getGptProThink())
+                    .gptProThinkLimitTime(chatgptUser.getGptProThinkLimitTime())
                     .gptDeepStyleLimit(chatgptUser.getGptDeepStyleLimit())
+                    .gptDeepStyleLimitTime(chatgptUser.getGptDeepStyleLimitTime())
                     .upgrade(upgrade)
                     .orderId(orderId)
                     .goodsId(goodsDonSku.getGoodsId())
@@ -698,8 +707,11 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
                     .otherLimitNum(chatgptUser.getOtherLimitNum())
                     .otherLimitTime(chatgptUser.getOtherLimitTime())
                     .gptThink(chatgptUser.getGptThink())
+                    .gptThinkLimitTime(chatgptUser.getGptThinkLimitTime())
                     .gptProThink(chatgptUser.getGptProThink())
+                    .gptProThinkLimitTime(chatgptUser.getGptProThinkLimitTime())
                     .gptDeepStyleLimit(chatgptUser.getGptDeepStyleLimit())
+                    .gptDeepStyleLimitTime(chatgptUser.getGptDeepStyleLimitTime())
                     .use(getConversationCount(chatgptUser.getUserToken(), chatgptUser.getLimitTime()))
                     .build();
         } else {
@@ -937,9 +949,13 @@ 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.setGptProThink(goodsDonSku.getGptProThink());
+            chatgptUser.setGptProThinkLimitTime(goodsDonSku.getGptProThinkLimitTime());
             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,9 +423,14 @@ 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.setGptProThink(finalSku.getGptProThink());
+			chatgptUser.setGptProThinkLimitTime(finalSku.getGptProThinkLimitTime());
 			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,9 +5228,13 @@ 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.setGptProThink(sku.getGptProThink());
+					chatgptUser.setGptProThinkLimitTime(sku.getGptProThinkLimitTime());
 					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,9 +757,14 @@ 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.setGptProThink(sku.getGptProThink());
+				chatgptUser.setGptProThinkLimitTime(sku.getGptProThinkLimitTime());
 				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

@@ -2495,8 +2495,11 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				ticket.setUserOtherLimitNum(userInfo.getOtherLimitNum());
 				ticket.setUserOtherLimitTime(userInfo.getOtherLimitTime());
 				ticket.setGptThink(userInfo.getGptThink());
+				ticket.setGptThinkLimitTime(userInfo.getGptThinkLimitTime());
 				ticket.setGptProThink(userInfo.getGptProThink());
+				ticket.setGptProThinkLimitTime(userInfo.getGptProThinkLimitTime());
 				ticket.setGptDeepStyleLimit(userInfo.getGptDeepStyleLimit());
+				ticket.setGptDeepStyleLimitTime(userInfo.getGptDeepStyleLimitTime());
 				ticket.setUserToken(userInfo.getUserToken());
 				ticket.setUse(userInfo.getUse());
 				ticket.setModel(userInfo.getModel());