zoujiajian 11 месяцев назад
Родитель
Сommit
a760a7bcc6

+ 2 - 7
netflix-dao/src/main/java/com/cyksj/model/views/ClaudeCodeUserInfoView.java

@@ -56,12 +56,7 @@ public class ClaudeCodeUserInfoView {
 	private Integer highestUsage;
 	private Integer highestUsage;
 
 
 	/**
 	/**
-	 * codex 每日限额
+	 * codex info
 	 */
 	 */
-	private Integer openaiDailyLimit;
-
-	/**
-	 * codex 总限额
-	 */
-	private Integer openaiQuota;
+	private CodexUserInfoView codexUserInfo;
 }
 }

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

@@ -33,10 +33,7 @@ import com.cyksj.model.response.ClaudeCodeRewardDetailsResp;
 import com.cyksj.model.response.CreditResetResp;
 import com.cyksj.model.response.CreditResetResp;
 import com.cyksj.model.response.TimeRateConfigsResp;
 import com.cyksj.model.response.TimeRateConfigsResp;
 import com.cyksj.model.response.claudecode.ClaudeCodeResp;
 import com.cyksj.model.response.claudecode.ClaudeCodeResp;
-import com.cyksj.model.views.ClaudeCodeUserApiKeysView;
-import com.cyksj.model.views.ClaudeCodeUserCreditCardRecordView;
-import com.cyksj.model.views.ClaudeCodeUserInfoView;
-import com.cyksj.model.views.ClaudeCodeUserResetRecordView;
+import com.cyksj.model.views.*;
 import com.cyksj.redis.RedisService;
 import com.cyksj.redis.RedisService;
 import com.cyksj.service.claude.ClaudeCodeService;
 import com.cyksj.service.claude.ClaudeCodeService;
 import com.cyksj.service.codex.CodexService;
 import com.cyksj.service.codex.CodexService;
@@ -394,6 +391,11 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 				codexService.createOrUpdateUserPackage(codexPackageReq);
 				codexService.createOrUpdateUserPackage(codexPackageReq);
 			}
 			}
 		}
 		}
+		CodexUserInfoView codexUserInfoView = null;
+		if (codexUser != null) {
+			codexUserInfoView = CodexUserInfoView.builder().planName(codexUser.getPlanName()).openaiDailyLimit(codexUser.getOpenaiDailyLimit()).openaiQuota(codexUser.getOpenaiQuota()).relationId(codexUser.getRelationId()).build();
+		}
+
 		return ClaudeCodeUserInfoView.builder()
 		return ClaudeCodeUserInfoView.builder()
 				.planName(claudeCodeUser.getPlanName())
 				.planName(claudeCodeUser.getPlanName())
 				.relationId(claudeCodeUser.getRelationId())
 				.relationId(claudeCodeUser.getRelationId())
@@ -404,8 +406,7 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 				.renewOrderId(claudeCodeUser.getRenewOrderId())
 				.renewOrderId(claudeCodeUser.getRenewOrderId())
 				.renewExpiryTime(claudeCodeUser.getRenewExpiryTime())
 				.renewExpiryTime(claudeCodeUser.getRenewExpiryTime())
 				.highestUsage(sku.getHighestUsage())
 				.highestUsage(sku.getHighestUsage())
-				.openaiDailyLimit(codexUser != null ? codexUser.getOpenaiDailyLimit() : null)
-				.openaiQuota(codexUser != null ? codexUser.getOpenaiQuota() : null)
+				.codexUserInfo(codexUserInfoView)
 				.build();
 				.build();
 	}
 	}