zoujiajian hace 11 meses
padre
commit
168116b975

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

@@ -756,16 +756,16 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 			throw new BusinessRuntimeException("补充卡已过期");
 		}
 
-		ClaudeCodeResp userBalance = getUserBalance(userId);
-		JSONObject data = Jsons.parseObject(userBalance.getData(), JSONObject.class);
-		Integer availableCredits = data.getInt("available_credits");
-		Integer creditLimit = data.getInt("credit_limit");
+		ClaudeCodeResp dashboard = getUserDashboard(userId);
+		JSONObject data = Jsons.parseObject(dashboard.getData(), JSONObject.class);
+		Integer daily_remaining = data.getInt("daily_remaining");
+		Integer daily_total = data.getInt("daily_total");
 		//超出积分 异常
-		if (availableCredits + creditCard.getCreditAmount() > creditLimit) {
-			throw BusinessRuntimeException.getInstance("目前使用只能补充到{0},建议您消耗更多积分后再兑换使用", creditLimit);
+		if (daily_remaining + creditCard.getCreditAmount() > daily_total) {
+			throw BusinessRuntimeException.getInstance("目前使用只能补充到{0},建议您消耗更多额度后再补充使用", daily_total);
 		}
 
-		Integer beforeCodePoints = availableCredits;
+		Integer beforeCodePoints = daily_remaining;
 		Integer addCodePoints = creditCard.getCreditAmount();
 		Integer afterCodePoints = beforeCodePoints + addCodePoints;
 

+ 8 - 8
netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -4629,14 +4629,14 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		}
 
 		//claude code 续费升级
-		if (goodsDon.getId() == Constant.CLAUDE_CODE_GOODS_ID) {
-			//是否存在已购买的codex
-			List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
-			Integer selectCount = groupsRelationMapper.selectCountByGoodsId(userIdList, Constant.CODEX_GOODS_ID, DateTime.now());
-			if (selectCount > 0) {
-				throw BusinessRuntimeException.getInstance("您已购买了codex套餐,如需claude可用codex抵扣升级,不可重复购买");
-			}
-		}
+//		if (goodsDon.getId() == Constant.CLAUDE_CODE_GOODS_ID) {
+//			//是否存在已购买的codex
+//			List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
+//			Integer selectCount = groupsRelationMapper.selectCountByGoodsId(userIdList, Constant.CODEX_GOODS_ID, DateTime.now());
+//			if (selectCount > 0) {
+//				throw BusinessRuntimeException.getInstance("您已购买了codex套餐,如需claude可用codex抵扣升级,不可重复购买");
+//			}
+//		}
 
 		OrderDon orderDon = new OrderDon();
 		orderDon.setUserId(userId);