zoujiajian 11 månader sedan
förälder
incheckning
66f0ebb68b

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

@@ -62,7 +62,7 @@ public class CodexServiceImpl implements CodexService {
 
 		if (codexUser == null) {
 			//是否有claude code
-			if (claudeCodeInfo.getCodePoints() != null) {
+			if (claudeCodeInfo != null && claudeCodeInfo.getCodePoints() != null) {
 				GoodsDonSku sku = null;
 				if (claudeCodeInfo.getRenewSkuId() != null) {
 					sku = skuMapper.selectById(claudeCodeInfo.getRenewSkuId());
@@ -315,7 +315,7 @@ public class CodexServiceImpl implements CodexService {
 		CodexUser codexUser = codexUserMapper.selectOne(Wrappers.lambdaQuery(CodexUser.class).in(CodexUser::getUserId, userIdList).last("limit 1"));
 
 		if (codexUser == null) {
-			throw new BusinessRuntimeException("用户未开通Codex服务");
+			return null;
 		}
 		
 		try {
@@ -430,7 +430,7 @@ public class CodexServiceImpl implements CodexService {
 		CodexUser codexUser = codexUserMapper.selectOne(Wrappers.lambdaQuery(CodexUser.class).in(CodexUser::getUserId, userIdList).last("limit 1"));
 
 		if (codexUser == null) {
-			throw new BusinessRuntimeException("用户未开通Codex服务");
+			return null;
 		}
 
 		// 调用Codex API获取用户控制台数据
@@ -445,7 +445,7 @@ public class CodexServiceImpl implements CodexService {
 		CodexUser codexUser = codexUserMapper.selectOne(Wrappers.lambdaQuery(CodexUser.class).in(CodexUser::getUserId, userIdList).last("limit 1"));
 
 		if (codexUser == null) {
-			throw new BusinessRuntimeException("用户未开通Codex服务");
+			return null;
 		}
 
 		// 调用Codex API获取用户分析数据

+ 1 - 27
netflix-web/src/main/java/com/cyksj/web/controller/codex/CodexController.java

@@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 /**
+ * server/codex
  * 项目名: yhlxj11111111
  * 文件名: CodexController
  * 创建者: Claude
@@ -58,22 +59,6 @@ public class CodexController {
         return GatewayResponse.SUCCESS.newBuilder().toResult(response);
     }
     
-    /**
-     * 获取系统OpenAI指标统计
-     * period 时间周期(today/7d/30d/all)
-     * metric 指标类型(usage/cost/requests/errors/all)
-     */
-    @GetMapping("/api/openai/system/metrics")
-    public ClaudeCodeResp getSystemMetrics(@RequestParam(defaultValue = "today") String period,
-                                          @RequestParam(defaultValue = "all") String metric) {
-        // 系统级指标查询,通常需要管理员权限
-        // 这里可以添加权限验证逻辑
-        long currentUserId = StpUserUtil.getLoginIdAsLong();
-
-        ClaudeCodeResp response = codexService.getSystemMetrics(period, metric);
-        return response;
-    }
-    
     /**
      * 获取用户密钥列表
      */
@@ -106,17 +91,6 @@ public class CodexController {
         return GatewayResponse.SUCCESS.newBuilder().toResult(response);
     }
     
-    /**
-     * 获取用户仪表盘数据
-     * 返回用户的OpenAI使用概览、限额信息、最近活动等综合数据
-     */
-    @GetMapping("/api/openai/users/dashboard")
-    public ClaudeCodeResp getUserDashboard() {
-        long userId = StpUserUtil.getLoginIdAsLong();
-        ClaudeCodeResp response = codexService.getUserDashboard(userId);
-        return response;
-    }
-    
     /**
      * 用户OpenAI控制台数据 (Java系统专用接口)
      */