zoujiajian před 11 měsíci
rodič
revize
ef39b633b0

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

@@ -247,14 +247,7 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 	public ClaudeCodeResp getUserDashboard(Long userId) throws Exception {
 		Long claudeCodeUserId = getClaudeCodeUserId(userId);
 		if (claudeCodeUserId != null) {
-			List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
-			Integer selectCount = codexUserMapper.selectCount(Wrappers.lambdaQuery(CodexUser.class).eq(CodexUser::getIsPay, Boolean.FALSE).in(CodexUser::getUserId, userIdList));
-			String service_type = "claude";
-			//有赠送 组合类型
-			if (selectCount > 0) {
-				service_type = "combined";
-			}
-			String url = String.format(Constant.CLAUDE_CODE_API_PREFIX + "api/claude/users/%s/dashboard?service_type=%s", claudeCodeUserId, service_type);
+			String url = String.format(Constant.CLAUDE_CODE_API_PREFIX + "api/claude/users/%s/dashboard", claudeCodeUserId);
 			ClaudeCodeResp claudeCodeResp = executeClaudeCodeGetApi(url);
 			return claudeCodeResp;
 		}

+ 1 - 7
netflix-service/src/main/java/com/cyksj/service/codex/impl/CodexServiceImpl.java

@@ -637,14 +637,8 @@ public class CodexServiceImpl implements CodexService {
 			return null;
 		}
 
-		//服务类型 区分赠送
-		String service_type = "openai";
-		if (!codexUser.getIsPay()) {
-			service_type = "combined";
-		}
-
 		// 调用Codex API获取用户控制台数据
-		String dashboardUrl = String.format(Constant.CLAUDE_CODE_API_PREFIX + "api/claude/users/%s/dashboard?service_type=%s", codexUser.getUserId(), service_type);
+		String dashboardUrl = String.format(Constant.CLAUDE_CODE_API_PREFIX + "api/openai/users/%/dashboard", codexUser.getUserId());
 		ClaudeCodeResp codexResp = executeCodexGetApi(dashboardUrl);
 		return codexResp;
 	}