zoujiajian hace 8 meses
padre
commit
71e8a86606

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

@@ -203,6 +203,16 @@ public class GoodsDonSkuFrontView {
 	 */
 	private Long gptThinkLimitTime;
 
+	/**
+	 * GPT 高级模型(pro) 次数
+	 */
+	private Integer gptPro;
+
+	/**
+	 * GPT 高级模型(pro) 限制时间
+	 */
+	private Long gptProLimitTime;
+
 	/**
 	 * 深度研究 次数
 	 */

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

@@ -478,6 +478,18 @@ public class RenewalView {
     @DbIgnore
     private Long gptThinkLimitTime;
 
+    /**
+     * GPT 高级模型(pro) 次数
+     */
+    @DbIgnore
+    private Integer gptPro;
+
+    /**
+     * GPT 高级模型(pro) 限制时间
+     */
+    @DbIgnore
+    private Long gptProLimitTime;
+
     /**
      * 深度研究 次数
      */

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

@@ -68,6 +68,16 @@ public class TicketRenewUpgradeView {
 	 */
 	private Long gptThinkLimitTime;
 
+	/**
+	 * GPT 高级模型(pro) 每天次数
+	 */
+	private Integer gptPro;
+
+	/**
+	 * GPT 高级模型(pro)限制时间
+	 */
+	private Long gptProLimitTime;
+
 	/**
 	 * 深度研究 次数
 	 */

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

@@ -2113,6 +2113,8 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 					ticketRenewUpgradeView.setUserOtherLimitTime(userInfo.getOtherLimitTime());
 					ticketRenewUpgradeView.setGptThink(userInfo.getGptThink());
 					ticketRenewUpgradeView.setGptThinkLimitTime(userInfo.getGptThinkLimitTime());
+					ticketRenewUpgradeView.setGptPro(userInfo.getGptPro());
+					ticketRenewUpgradeView.setGptProLimitTime(userInfo.getGptProLimitTime());
 					ticketRenewUpgradeView.setGptDeepStyleLimit(userInfo.getGptDeepStyleLimit());
 					ticketRenewUpgradeView.setGptDeepStyleLimitTime(userInfo.getGptDeepStyleLimitTime());
 					if (userInfo.getPackageId() != 0) {
@@ -2800,6 +2802,8 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				ticket.setUserOtherLimitTime(userInfo.getOtherLimitTime());
 				ticket.setGptThink(userInfo.getGptThink());
 				ticket.setGptThinkLimitTime(userInfo.getGptThinkLimitTime());
+				ticket.setGptPro(userInfo.getGptPro());
+				ticket.setGptProLimitTime(userInfo.getGptProLimitTime());
 				ticket.setGptDeepStyleLimit(userInfo.getGptDeepStyleLimit());
 				ticket.setGptDeepStyleLimitTime(userInfo.getGptDeepStyleLimitTime());
 				ticket.setUserToken(userInfo.getUserToken());

+ 3 - 0
netflix-service/src/main/java/com/cyksj/service/vip/impl/VipFrontServiceImpl.java

@@ -412,6 +412,9 @@ public class VipFrontServiceImpl implements VipFrontService {
 				}
 			}
 		}
+		if (totalDays == 0) {
+			return BigDecimal.ZERO;
+		}
 		Long thisDeductBetweenDay = DateUtil.betweenDay(now, relationExpiryTime, false) + 1;
 		BigDecimal single = totalOrderMoney.divide(BigDecimal.valueOf(totalDays), 0, RoundingMode.HALF_UP);
 		//该车票抵扣金额