zoujiajian 11 mesi fa
parent
commit
542865ea19

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

@@ -246,4 +246,24 @@ public class GoodsDonSkuFrontView {
 	 * cc最高约可使用次数
 	 */
 	private Integer highestUsage;
+
+	/**
+	 * 是否赠送codex
+	 */
+	private Boolean isCodex;
+
+	/**
+	 * codex套餐名
+	 */
+	private String codexPlanName;
+
+	/**
+	 * 每日预算上限
+	 */
+	private Integer openaiDailyLimit;
+
+	/**
+	 * 每月预算上限
+	 */
+	private Integer openaiQuota;
 }

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

@@ -106,4 +106,27 @@ public class GoodsDonSkuRenewView {
 	@DbField("sku.highest_usage")
 	private Integer highestUsage;
 
+	/**
+	 * 是否赠送codex
+	 */
+	@DbField("sku.is_codex")
+	private Boolean isCodex;
+
+	/**
+	 * codex套餐名
+	 */
+	@DbField("sku.codex_plan_name")
+	private String codexPlanName;
+
+	/**
+	 * 每日预算上限
+	 */
+	@DbField("sku.openai_daily_limit")
+	private Integer openaiDailyLimit;
+
+	/**
+	 * 每月预算上限
+	 */
+	@DbField("sku.openai_quota")
+	private Integer openaiQuota;
 }

+ 24 - 0
netflix-dao/src/main/java/com/cyksj/model/views/GoodsDonSkuView.java

@@ -92,6 +92,30 @@ public class GoodsDonSkuView {
 	@DbField("gdk.highest_usage")
 	private Integer highestUsage;
 
+	/**
+	 * 是否赠送codex
+	 */
+	@DbField("gdk.is_codex")
+	private Boolean isCodex;
+
+	/**
+	 * codex套餐名
+	 */
+	@DbField("gdk.codex_plan_name")
+	private String codexPlanName;
+
+	/**
+	 * 每日预算上限
+	 */
+	@DbField("gdk.openai_daily_limit")
+	private Integer openaiDailyLimit;
+
+	/**
+	 * 每月预算上限
+	 */
+	@DbField("gdk.openai_quota")
+	private Integer openaiQuota;
+
 	/**
 	 * 优惠券id
 	 */

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

@@ -108,5 +108,29 @@ public class RenewUpgradePackageFrontView {
 		 */
 		@DbField("sku.highest_usage")
 		private Integer highestUsage;
+
+		/**
+		 * 是否赠送codex
+		 */
+		@DbField("sku.is_codex")
+		private Boolean isCodex;
+
+		/**
+		 * codex套餐名
+		 */
+		@DbField("sku.codex_plan_name")
+		private String codexPlanName;
+
+		/**
+		 * 每日预算上限
+		 */
+		@DbField("sku.openai_daily_limit")
+		private Integer openaiDailyLimit;
+
+		/**
+		 * 每月预算上限
+		 */
+		@DbField("sku.openai_quota")
+		private Integer openaiQuota;
 	}
 }

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

@@ -95,4 +95,19 @@ public class TicketRenewUpgradeView {
 	 * cc最高约可使用次数
 	 */
 	private Integer highestUsage;
+
+	/**
+	 * codex套餐名
+	 */
+	private String codexPlanName;
+
+	/**
+	 * 每日预算上限
+	 */
+	private Integer openaiDailyLimit;
+
+	/**
+	 * 每月预算上限
+	 */
+	private Integer openaiQuota;
 }

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

@@ -208,4 +208,28 @@ public class YhShopGoodsSkuFrontView {
 	 */
 	@DbField("sku.highest_usage")
 	private Integer highestUsage;
+
+	/**
+	 * 是否赠送codex
+	 */
+	@DbField("sku.is_codex")
+	private Boolean isCodex;
+
+	/**
+	 * codex套餐名
+	 */
+	@DbField("sku.codex_plan_name")
+	private String codexPlanName;
+
+	/**
+	 * 每日预算上限
+	 */
+	@DbField("sku.openai_daily_limit")
+	private Integer openaiDailyLimit;
+
+	/**
+	 * 每月预算上限
+	 */
+	@DbField("sku.openai_quota")
+	private Integer openaiQuota;
 }

+ 3 - 1
netflix-service/src/main/java/com/cyksj/service/claude/impl/ClaudeCodeServiceImpl.java

@@ -375,6 +375,7 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 
 			}
 		}
+		CodexUser codexUser = codexUserMapper.selectOne(Wrappers.lambdaQuery(CodexUser.class).eq(CodexUser::getRelationId, claudeCodeUser.getRelationId()).in(CodexUser::getUserId, userIdList).last("limit 1"));
 		return ClaudeCodeUserInfoView.builder()
 				.planName(claudeCodeUser.getPlanName())
 				.relationId(claudeCodeUser.getRelationId())
@@ -385,9 +386,10 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 				.renewOrderId(claudeCodeUser.getRenewOrderId())
 				.renewExpiryTime(claudeCodeUser.getRenewExpiryTime())
 				.highestUsage(sku.getHighestUsage())
+				.openaiDailyLimit(codexUser != null ? codexUser.getOpenaiDailyLimit() : null)
+				.openaiQuota(codexUser != null ? codexUser.getOpenaiQuota() : null)
 				.build();
 	}
-
 	public ClaudeCodeResp createOrUpdateClaudeCodeUserPackage(Long userId, String planName, Integer codePoints, Integer codeCreditRecovery, Date startTime, Date expiryTime, GoodsDonSku sku) throws Exception {
 		Map<String, Object> parmas = new HashMap<>();
 		parmas.put("plan_name", planName.replaceAll(";", ""));

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

@@ -2038,12 +2038,14 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 			//claude code
 			if (groupsRelationView.getGoodsId() == Constant.CLAUDE_CODE_GOODS_ID) {
 				try {
-					//gpt用户镜像
+					//cc用户镜像
 					ClaudeCodeUserInfoView userInfo = claudeCodeService.getClaudeCodeUserSubsInfo(userId);
 					ticketRenewUpgradeView.setCodePoints(userInfo.getCodePoints());
 					ticketRenewUpgradeView.setCodeCreditRecovery(userInfo.getCodeCreditRecovery());
 					ticketRenewUpgradeView.setIsRenewPackage(userInfo.getRenewSkuId() != null ? true : false);
 					ticketRenewUpgradeView.setHighestUsage(userInfo.getHighestUsage());
+					ticketRenewUpgradeView.setOpenaiDailyLimit(userInfo.getOpenaiDailyLimit());
+					ticketRenewUpgradeView.setOpenaiQuota(userInfo.getOpenaiQuota());
 					Long renewSkuId = userInfo.getRenewSkuId();
 					if (renewSkuId != null) {
 						GoodsDonSkuRenewView renewSku = beanSearcher.searchFirst(GoodsDonSkuRenewView.class, MapUtils.builder().field(GoodsDonSkuRenewView::getSkuId, renewSkuId).build());