zoujiajian 11 tháng trước cách đây
mục cha
commit
b71f9b13c4

+ 5 - 0
netflix-dao/src/main/java/com/cyksj/model/views/ClaudeCodeUserInfoView.java

@@ -49,4 +49,9 @@ public class ClaudeCodeUserInfoView {
 	 * 续费升级过期时间
 	 */
 	private Date renewExpiryTime;
+
+	/**
+	 * cc最高约可使用次数
+	 */
+	private Integer highestUsage;
 }

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

@@ -99,4 +99,11 @@ public class GoodsDonSkuRenewView {
 	 */
 	@DbField("sku.code_credit_recovery")
 	private Integer codeCreditRecovery;
+
+	/**
+	 * cc最高约可使用次数
+	 */
+	@DbField("sku.highest_usage")
+	private Integer highestUsage;
+
 }

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

@@ -90,4 +90,9 @@ public class TicketRenewUpgradeView {
 	 * claude code每小时恢复积分
 	 */
 	private Integer codeCreditRecovery;
+
+	/**
+	 * cc最高约可使用次数
+	 */
+	private Integer highestUsage;
 }

+ 7 - 2
netflix-service/src/main/java/com/cyksj/service/claude/impl/ClaudeCodeServiceImpl.java

@@ -335,6 +335,7 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 			}
 			return null;
 		}
+		GoodsDonSku sku = null;
 		if (claudeCodeUser == null) {
 			OrderDon orderDon = orderDonMapper.selectOne(Wrappers.lambdaQuery(OrderDon.class)
 					.eq(OrderDon::getGoodsId, Constant.CLAUDE_CODE_GOODS_ID)
@@ -344,13 +345,13 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 					.orderByDesc(OrderDon::getId)
 					.last("limit 1"));
 			if (orderDon != null) {
-				GoodsDonSku sku = skuMapper.selectById(orderDon.getSkuId());
+				sku = skuMapper.selectById(orderDon.getSkuId());
 				generateOrUpdateClaudeCodeUserInfo(orderDon.getId(), orderDon.getRelationId(), orderDon.getUserId(), sku, orderDon.getOrderType());
 				claudeCodeUser = claudeCodeUserMapper.selectOne(Wrappers.lambdaQuery(ClaudeCodeUser.class).in(ClaudeCodeUser::getUserId, userIdList).last("limit 1"));
 			} else {
 				//试用车票
 				Long skuId = groupsRelationView.getSkuId();
-				GoodsDonSku sku = skuMapper.selectById(skuId);
+				sku = skuMapper.selectById(skuId);
 				generateOrUpdateClaudeCodeUserInfo(null, groupsRelationView.getId(), groupsRelationView.getUserId(), sku, null);
 				claudeCodeUser = claudeCodeUserMapper.selectOne(Wrappers.lambdaQuery(ClaudeCodeUser.class).in(ClaudeCodeUser::getUserId, userIdList).last("limit 1"));
 			}
@@ -358,6 +359,9 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 			claudeCodeUser.setExpiryTime(groupsRelationView.getExpiryTime());
 			claudeCodeUserMapper.updateById(claudeCodeUser);
 		}
+		if (sku == null) {
+			sku = skuMapper.selectById(groupsRelationView.getSkuId());
+		}
 		//是否需要重试更新 cladueCode userInfo信息
 		if (claudeCodeUser.getIsRetry()) {
 			try {
@@ -382,6 +386,7 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 				.renewSkuId(claudeCodeUser.getRenewSkuId())
 				.renewOrderId(claudeCodeUser.getRenewOrderId())
 				.renewExpiryTime(claudeCodeUser.getRenewExpiryTime())
+				.highestUsage(sku.getHighestUsage())
 				.build();
 	}
 

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

@@ -1935,6 +1935,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 					ticketRenewUpgradeView.setCodePoints(userInfo.getCodePoints());
 					ticketRenewUpgradeView.setCodeCreditRecovery(userInfo.getCodeCreditRecovery());
 					ticketRenewUpgradeView.setIsRenewPackage(userInfo.getRenewSkuId() != null ? true : false);
+					ticketRenewUpgradeView.setHighestUsage(userInfo.getHighestUsage());
 					Long renewSkuId = userInfo.getRenewSkuId();
 					if (renewSkuId != null) {
 						GoodsDonSkuRenewView renewSku = beanSearcher.searchFirst(GoodsDonSkuRenewView.class, MapUtils.builder().field(GoodsDonSkuRenewView::getSkuId, renewSkuId).build());