GPT镜像其他模型次数

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

@@ -73,6 +73,26 @@ public class ChatgptUser extends BaseEntity {
      */
     private Long limitTime;
 
+    /**
+     * deepseek限制次数
+     */
+    private Integer dsLimitNum;
+
+    /**
+     * deepseek限制时间
+     */
+    private Long dsLimitTime;
+
+    /**
+     * 其他模型限制次数
+     */
+    private Integer otherLimitNum;
+
+    /**
+     * 其他模型限制时间
+     */
+    private Long otherLimitTime;
+
     /**
      * 是否为车队
      */

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

@@ -195,6 +195,30 @@ public class GoodsDonSku extends BaseEntity {
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer lumaNum;
 
+    /**
+     * deepseek限制次数
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Integer dsLimitNum;
+
+    /**
+     * deepseek限制时间
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Long dsLimitTime;
+
+    /**
+     * 其他模型限制次数
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Integer otherLimitNum;
+
+    /**
+     * 其他模型限制时间
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Long otherLimitTime;
+
     /**
      * 特定价格
      */

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

@@ -164,6 +164,26 @@ public class ReqGoodsSkuInsert {
 
         private Integer lumaNum;
 
+        /**
+         * deepseek限制次数
+         */
+        private Integer dsLimitNum;
+
+        /**
+         * deepseek限制时间
+         */
+        private Long dsLimitTime;
+
+        /**
+         * 其他模型限制次数
+         */
+        private Integer otherLimitNum;
+
+        /**
+         * 其他模型限制时间
+         */
+        private Long otherLimitTime;
+
         /**
          * 备注
          */

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

@@ -39,6 +39,26 @@ public class ChatGptUserView {
      */
     private Integer limitNum;
 
+    /**
+     * deepseek限制次数
+     */
+    private Integer dsLimitNum;
+
+    /**
+     * deepseek限制时间
+     */
+    private Long dsLimitTime;
+
+    /**
+     * 其他模型限制次数
+     */
+    private Integer otherLimitNum;
+
+    /**
+     * 其他模型限制时间
+     */
+    private Long otherLimitTime;
+
     /**
      * 使用次数
      */

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

@@ -206,4 +206,24 @@ public class GoodsDonSkuFrontView {
 	private Integer lumaNum;
 
 	private String remark;
+
+	/**
+	 * deepseek限制次数
+	 */
+	private Integer dsLimitNum;
+
+	/**
+	 * deepseek限制时间
+	 */
+	private Long dsLimitTime;
+
+	/**
+	 * 其他模型限制次数
+	 */
+	private Integer otherLimitNum;
+
+	/**
+	 * 其他模型限制时间
+	 */
+	private Long otherLimitTime;
 }

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

@@ -49,6 +49,30 @@ public class GoodsDonSkuRenewView {
 	@DbField("sku.gpt_limit_time")
 	private Long gptUserLimitTime;
 
+	/**
+	 * deepseek限制次数
+	 */
+	@DbField("sku.ds_limit_num")
+	private Integer userDsLimitNum;
+
+	/**
+	 * deepseek限制时间
+	 */
+	@DbField("sku.ds_limit_time")
+	private Long userDsLimitTime;
+
+	/**
+	 * 其他模型限制次数
+	 */
+	@DbField("sku.other_limit_num")
+	private Integer userOtherLimitNum;
+
+	/**
+	 * 其他模型限制时间
+	 */
+	@DbField("sku.other_limit_time")
+	private Long userOtherLimitTime;
+
 	/**
 	 * 续费升级套餐id
 	 */

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

@@ -58,6 +58,30 @@ public class RenewUpgradePackageFrontView {
 		@DbField("sku.gpt_limit_time")
 		private Long gptLimitTime;
 
+		/**
+		 * deepseek限制次数
+		 */
+		@DbField("sku.ds_limit_num")
+		private Integer dsLimitNum;
+
+		/**
+		 * deepseek限制时间
+		 */
+		@DbField("sku.ds_limit_time")
+		private Long dsLimitTime;
+
+		/**
+		 * 其他模型限制次数
+		 */
+		@DbField("sku.other_limit_num")
+		private Integer otherLimitNum;
+
+		/**
+		 * 其他模型限制时间
+		 */
+		@DbField("sku.other_limit_time")
+		private Long otherLimitTime;
+
 		@DbField("sku.spec_val")
 		private String specVal;
 

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

@@ -261,6 +261,30 @@ public class RenewalView {
     @DbField("sku.luma_num")
     private Integer lumaNUm;
 
+    /**
+     * deepseek限制次数
+     */
+    @DbField("sku.ds_limit_num")
+    private Integer dsLimitNum;
+
+    /**
+     * deepseek限制时间
+     */
+    @DbField("sku.ds_limit_time")
+    private Long dsLimitTime;
+
+    /**
+     * 其他模型限制次数
+     */
+    @DbField("sku.other_limit_num")
+    private Integer otherLimitNum;
+
+    /**
+     * 其他模型限制时间
+     */
+    @DbField("sku.other_limit_time")
+    private Long otherLimitTime;
+
     /**
      * 关联邮箱 接收邮件
      */
@@ -325,6 +349,30 @@ public class RenewalView {
     @DbIgnore
     private Integer lumaUserNum;
 
+    /**
+     * deepseek限制次数
+     */
+    @DbIgnore
+    private Integer userDsLimitNum;
+
+    /**
+     * deepseek限制时间
+     */
+    @DbIgnore
+    private Long userDsLimitTime;
+
+    /**
+     * 其他模型限制次数
+     */
+    @DbIgnore
+    private Integer userOtherLimitNum;
+
+    /**
+     * 其他模型限制时间
+     */
+    @DbIgnore
+    private Long userOtherLimitTime;
+
     @DbIgnore
     private Long use;
 

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

@@ -158,6 +158,30 @@ public class YhShopGoodsSkuFrontView {
 	@DbField("sku.luma_num")
 	private Integer lumaNum;
 
+	/**
+	 * deepseek限制次数
+	 */
+	@DbField("sku.ds_limit_num")
+	private Integer dsLimitNum;
+
+	/**
+	 * deepseek限制时间
+	 */
+	@DbField("sku.ds_limit_time")
+	private Long dsLimitTime;
+
+	/**
+	 * 其他模型限制次数
+	 */
+	@DbField("sku.other_limit_num")
+	private Integer otherLimitNum;
+
+	/**
+	 * 其他模型限制时间
+	 */
+	@DbField("sku.other_limit_time")
+	private Long otherLimitTime;
+
 	@DbField("sku.remark")
 	private Boolean remark;
 }

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

@@ -317,6 +317,10 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
             chatgptUser.setIsCar(true);
             chatgptUser.setLimitNum(goodsDonSku.getGptLimitNum());
             chatgptUser.setLimitTime(goodsDonSku.getGptLimitTime());
+            chatgptUser.setDsLimitTime(goodsDonSku.getDsLimitTime());
+            chatgptUser.setDsLimitNum(goodsDonSku.getDsLimitNum());
+            chatgptUser.setOtherLimitNum(goodsDonSku.getOtherLimitNum());
+            chatgptUser.setOtherLimitTime(goodsDonSku.getOtherLimitTime());
         }
         try {
             chatgptUser.setExpireTime(groupsRelation.getExpiryTime());
@@ -356,6 +360,10 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
             chatgptUser.setIsCar(true);
             chatgptUser.setLimitNum(goodsDonSku.getGptLimitNum());
             chatgptUser.setLimitTime(goodsDonSku.getGptLimitTime());
+            chatgptUser.setDsLimitNum(goodsDonSku.getDsLimitNum());
+            chatgptUser.setDsLimitTime(goodsDonSku.getDsLimitTime());
+            chatgptUser.setOtherLimitNum(goodsDonSku.getOtherLimitNum());
+            chatgptUser.setOtherLimitTime(goodsDonSku.getOtherLimitTime());
         }
         try {
             chatgptUser.setExpireTime(DateUtil.offsetMonth(DateTime.now(), goodsDonSku.getMonths()));
@@ -626,6 +634,10 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
                     .expireTime(chatgptUser.getExpireTime())
                     .limitNum(chatgptUser.getLimitNum())
                     .limitTime(chatgptUser.getLimitTime())
+                    .dsLimitNum(chatgptUser.getDsLimitNum())
+                    .dsLimitTime(chatgptUser.getDsLimitTime())
+                    .otherLimitNum(chatgptUser.getOtherLimitNum())
+                    .otherLimitTime(chatgptUser.getOtherLimitTime())
                     .upgrade(upgrade)
                     .orderId(orderId)
                     .goodsId(goodsDonSku.getGoodsId())
@@ -659,6 +671,10 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
                     .expireTime(chatgptUser.getExpireTime())
                     .limitNum(chatgptUser.getLimitNum())
                     .limitTime(chatgptUser.getLimitTime())
+                    .dsLimitNum(chatgptUser.getDsLimitNum())
+                    .dsLimitTime(chatgptUser.getDsLimitTime())
+                    .otherLimitNum(chatgptUser.getOtherLimitNum())
+                    .otherLimitTime(chatgptUser.getOtherLimitTime())
                     .use(getConversationCount(chatgptUser.getUserToken(), chatgptUser.getLimitTime()))
                     .build();
         } else {
@@ -812,6 +828,10 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
             chatgptUser.setIsCar(true);
             chatgptUser.setLimitNum(goodsDonSku.getGptLimitNum());
             chatgptUser.setLimitTime(goodsDonSku.getGptLimitTime());
+            chatgptUser.setDsLimitNum(goodsDonSku.getDsLimitNum());
+            chatgptUser.setDsLimitTime(goodsDonSku.getDsLimitTime());
+            chatgptUser.setOtherLimitNum(goodsDonSku.getOtherLimitNum());
+            chatgptUser.setOtherLimitTime(goodsDonSku.getOtherLimitTime());
         }
         try {
             DateTime dateTime = DateUtil.offsetMonth(new Date(), 1);

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

@@ -215,6 +215,10 @@ public class MirrorUserCleatServiceImpl implements MirrorUserCleatService {
 			//还原镜像user
 			chatgptUser.setLimitTime(finalSku.getGptLimitTime());
 			chatgptUser.setLimitNum(finalSku.getGptLimitNum());
+			chatgptUser.setDsLimitNum(finalSku.getDsLimitNum());
+			chatgptUser.setDsLimitTime(finalSku.getDsLimitTime());
+			chatgptUser.setOtherLimitNum(finalSku.getOtherLimitNum());
+			chatgptUser.setOtherLimitTime(finalSku.getOtherLimitTime());
 			chatgptUser.setRenewExpiryTime(renewExpiryTime);
 			chatgptUserMapper.updateById(chatgptUser);
 			log.info("还原镜像gptuser套餐成功");

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

@@ -4572,6 +4572,10 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 					log.info("GPT用户续费升级订单skuId:{}将用户车票relationId:{}套餐续费升级", order.getSkuId(), relationId);
 					chatgptUser.setLimitTime(sku.getGptLimitTime());
 					chatgptUser.setLimitNum(sku.getGptLimitNum());
+					chatgptUser.setDsLimitTime(sku.getDsLimitTime());
+					chatgptUser.setDsLimitNum(sku.getDsLimitNum());
+					chatgptUser.setOtherLimitTime(sku.getOtherLimitTime());
+					chatgptUser.setOtherLimitNum(sku.getOtherLimitNum());
 					//记录续费升级过期的时间
 					chatgptUser.setRenewExpiryTime(newDate);
 					chatgptUser.setRenewOrderId(order.getId());

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

@@ -1374,6 +1374,10 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				ChatGptUserView userInfo = chatGptAccountService.getUserInfo(ticket.getUserId(), ticket.getRelationId());
 				ticket.setGptUserLimitNum(userInfo.getLimitNum());
 				ticket.setGptUserLimitTime(userInfo.getLimitTime());
+				ticket.setUserDsLimitNum(userInfo.getDsLimitNum());
+				ticket.setUserDsLimitTime(userInfo.getDsLimitTime());
+				ticket.setUserOtherLimitNum(userInfo.getOtherLimitNum());
+				ticket.setUserOtherLimitTime(userInfo.getOtherLimitTime());
 				ticket.setUse(userInfo.getUse());
 				ticket.setModel(userInfo.getModel());
 				Integer count = upgradePackageMapper.selectCount(Wrappers.lambdaQuery(UpgradePackage.class).apply("JSON_CONTAINS(sku_ids,'\"" + ticket.getSkuId() + "\"')")