zoujiajian 1 年之前
父節點
當前提交
2c8fc5c1be

+ 5 - 0
netflix-dao/src/main/java/com/cyksj/model/entity/ClaudeCodeUser.java

@@ -18,6 +18,11 @@ import java.util.Date;
 public class ClaudeCodeUser extends BaseEntity{
 	private Long userId;
 
+	/**
+	 * 套餐
+	 */
+	private String planName;
+
 	private Long relationId;
 
 	/**

+ 1 - 1
netflix-service/src/main/java/com/cyksj/service/claude/ClaudeCodeService.java

@@ -67,5 +67,5 @@ public interface ClaudeCodeService {
 
 	Boolean checkClaudeCodeUser(Long userId);
 
-	void updateClaudeCodeUserPackageInfo(ClaudeCodeUser claudeCodeUser, String planName);
+	void updateClaudeCodeUserPackageInfo(ClaudeCodeUser claudeCodeUser);
 }

+ 10 - 9
netflix-service/src/main/java/com/cyksj/service/claude/impl/ClaudeCodeServiceImpl.java

@@ -102,7 +102,7 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 			if (orderType == 2) {
 				invalidateUserCache(relationUserId);
 			}
-			generateOrUpdateClaudeCodeUser(relationUserId, relationId, codePoints, codeCreditRecovery, expiryTime, isUpgrade, orderId, skuId, renewExpiryTime);
+			generateOrUpdateClaudeCodeUser(relationUserId, relationId, codePoints, codeCreditRecovery, expiryTime, isUpgrade, orderId, skuId, renewExpiryTime, sku.getSpecVal());
 			//生成claude code或更新用户套餐
 			ClaudeCodeResp codeUserPackage = createOrUpdateClaudeCodeUserPackage(relation.getUserId(), sku.getSpecVal(), codePoints, codeCreditRecovery, expiryTime);
 			if (!Constant.SUCCESS.equals(codeUserPackage.getMessage())) {
@@ -117,21 +117,22 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 		}
 	}
 
-	private void generateOrUpdateClaudeCodeUser(Long relationUserId, Long relationId, Integer codePoints, Integer codeCreditRecovery, Date expiryTime, Boolean isUpgrade, Long orderId, Long renewSkuId, Date renewExpiryTime) {
+	private void generateOrUpdateClaudeCodeUser(Long relationUserId, Long relationId, Integer codePoints, Integer codeCreditRecovery, Date expiryTime, Boolean isUpgrade, Long orderId, Long renewSkuId, Date renewExpiryTime, String planName) {
 		ClaudeCodeUser claudeCodeUser = claudeCodeUserMapper.selectOne(Wrappers.lambdaQuery(ClaudeCodeUser.class).eq(ClaudeCodeUser::getRelationId, relationId).last("limit 1"));
 		if (claudeCodeUser == null) {
 			claudeCodeUser = new ClaudeCodeUser();
-			claudeCodeUser.setUserId(relationUserId);
-			claudeCodeUser.setRelationId(relationId);
-			claudeCodeUser.setExpiryTime(expiryTime);
-			claudeCodeUser.setCodePoints(codePoints);
-			claudeCodeUser.setCodeCreditRecovery(codeCreditRecovery);
 		}
 		if (isUpgrade) {
 			claudeCodeUser.setRenewOrderId(orderId);
 			claudeCodeUser.setRenewSkuId(renewSkuId);
 			claudeCodeUser.setRenewExpiryTime(renewExpiryTime);
 		}
+		claudeCodeUser.setUserId(relationUserId);
+		claudeCodeUser.setPlanName(planName);
+		claudeCodeUser.setRelationId(relationId);
+		claudeCodeUser.setExpiryTime(expiryTime);
+		claudeCodeUser.setCodePoints(codePoints);
+		claudeCodeUser.setCodeCreditRecovery(codeCreditRecovery);
 		if (claudeCodeUser.getId() == null) {
 			try {
 				claudeCodeUserMapper.insert(claudeCodeUser);
@@ -380,9 +381,9 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 	}
 
 	@Override
-	public void updateClaudeCodeUserPackageInfo(ClaudeCodeUser claudeCodeUser, String planName) {
+	public void updateClaudeCodeUserPackageInfo(ClaudeCodeUser claudeCodeUser) {
 		try {
-			ClaudeCodeResp codeUserPackage = createOrUpdateClaudeCodeUserPackage(claudeCodeUser.getUserId(), planName, claudeCodeUser.getCodePoints(), claudeCodeUser.getCodeCreditRecovery(), claudeCodeUser.getExpiryTime());
+			ClaudeCodeResp codeUserPackage = createOrUpdateClaudeCodeUserPackage(claudeCodeUser.getUserId(), claudeCodeUser.getPlanName(), claudeCodeUser.getCodePoints(), claudeCodeUser.getCodeCreditRecovery(), claudeCodeUser.getExpiryTime());
 			if (!Constant.SUCCESS.equals(codeUserPackage.getMessage())) {
 				//重试标记
 				claudeCodeUser.setIsRetry(Boolean.TRUE);

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

@@ -172,13 +172,14 @@ public class MirrorUserCleatServiceImpl implements MirrorUserCleatService {
 			claudeCodeUser.setCodePoints(finalSku.getCodePoints());
 			claudeCodeUser.setCodeCreditRecovery(finalSku.getCodeCreditRecovery());
 			claudeCodeUser.setRenewExpiryTime(renewExpiryTime);
+			claudeCodeUser.setPlanName(finalSku.getSpecVal());
 			claudeCodeUserMapper.updateById(claudeCodeUser);
 			log.info("还原镜像claude code user套餐成功");
 			//将续费有效置为过期
 			renewExpiryRecord.setIsValid(true);
 			claudeCodeUserRenewExpiryRecordMapper.updateById(renewExpiryRecord);
 			//调用api更新claude code用户信息
-			claudeCodeService.updateClaudeCodeUserPackageInfo(claudeCodeUser, finalSku.getSpecVal());
+			claudeCodeService.updateClaudeCodeUserPackageInfo(claudeCodeUser);
 			return;
 		}
 		OrderDonRenewRecord orderDonRenewRecord = orderDonRenewRecordMapper.selectOne(Wrappers.lambdaQuery(OrderDonRenewRecord.class)