zoujiajian 11 maanden geleden
bovenliggende
commit
4147b181cb

+ 3 - 8
netflix-dao/src/main/java/com/cyksj/model/entity/ClaudeCodeUserResetRecord.java

@@ -38,16 +38,11 @@ public class ClaudeCodeUserResetRecord extends BaseEntity {
      * 重置类型 1:手动重置 2:系统重置
      */
     private Integer resetType;
-    
-    /**
-     * 操作人ID
-     */
-    private Long operatorId;
-    
+
     /**
-     * 操作人姓名
+     * 正数为加 负数扣除
      */
-    private String operatorName;
+    private Integer num;
     
     /**
      * 重置原因

+ 5 - 0
netflix-dao/src/main/java/com/cyksj/model/response/ClaudeCodeRewardDetailsResp.java

@@ -35,4 +35,9 @@ public class ClaudeCodeRewardDetailsResp {
      * 带入账金额
      */
     private BigDecimal waitingMoney;
+
+    /**
+     * claude code分销比例
+     */
+    private Integer rate;
 }

+ 3 - 18
netflix-dao/src/main/java/com/cyksj/model/views/ClaudeCodeUserResetRecordView.java

@@ -39,24 +39,9 @@ public class ClaudeCodeUserResetRecordView {
      */
     @DbField
     private Integer afterCodePoints;
-    
-    /**
-     * 重置类型 1:管理员重置 2:系统自动重置 3:用户自助重置
-     */
-    @DbField
-    private Integer resetType;
-    
-    /**
-     * 操作人ID
-     */
-    @DbField
-    private Long operatorId;
-    
-    /**
-     * 操作人姓名
-     */
+
     @DbField
-    private String operatorName;
+    private Integer num;
     
     /**
      * 重置原因
@@ -68,5 +53,5 @@ public class ClaudeCodeUserResetRecordView {
      * 创建时间
      */
     @DbField
-    private Date createTime;
+    private Date createdTime;
 }

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

@@ -114,7 +114,7 @@ public interface ClaudeCodeService {
 	void useCreditCard(Long userId, Integer addCodePoints, String cardNumber, String useReason);
 
 	/**
-	 * 用户使用重置次数 - 保持幂等性
+	 * 用户使用重置次数
 	 */
 	void useResetCount(Long userId) throws Exception;
 

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

@@ -86,6 +86,8 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 
 	private final DistributePointsExchangeMoneyMapper distributePointsExchangeMoneyMapper;
 
+	private final GoodsDonMapper goodsDonMapper;
+
 	private final static String CLAUDE_CODE_API_PREFIX = "https://relay01.yhlxj.com/";
 
 	public static final String CLAUDE_CODE_HEARD_KEY = "X-Admin-Key";
@@ -762,6 +764,12 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 			//调用API重置用户次数
 			resetUserCredits(claudeCodeUser.getUserId(), creditResetReq);
 
+			ClaudeCodeUserResetRecord resetRecord = new ClaudeCodeUserResetRecord();
+			resetRecord.setUserId(userId);
+			resetRecord.setNum(-1);
+			resetRecord.setResetReason("使用重置次数");
+			claudeCodeUserResetRecordMapper.insert(resetRecord);
+
 		} else {
 			throw BusinessRuntimeException.getInstance("使用重置次数失败");
 		}
@@ -864,7 +872,7 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 		return beanSearcher.search(ClaudeCodeUserResetRecordView.class, MapUtils.builder()
 			.field(ClaudeCodeUserResetRecordView::getUserId, userIdList).op(Operator.InList)
 			.page(page, limit)
-			.orderBy(ClaudeCodeUserResetRecordView::getCreateTime).desc()
+			.orderBy(ClaudeCodeUserResetRecordView::getCreatedTime).desc()
 			.build());
 	}
 
@@ -920,6 +928,11 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 					waitingPoints = points.get();
 				}
 			}
+			GoodsDon goodsDon = goodsDonMapper.selectById(Constant.CLAUDE_CODE_GOODS_ID);
+			//cc 分销平台比例
+			if (goodsDon != null) {
+				response.setRate(goodsDon.getRate());
+			}
 
 			if (user.getPoints().compareTo(BigDecimal.ZERO) <= 0 && waitingPoints.compareTo(BigDecimal.ZERO) <= 0) {
 				response.setGotMoney(BigDecimal.ZERO);
@@ -1009,6 +1022,7 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 			resetRecord.setOrderId(orderId);
 			resetRecord.setUserId(userId);
 			resetRecord.setResetReason(remark);
+			resetRecord.setNum(num);
 			claudeCodeUserResetRecordMapper.insert(resetRecord);
 		}
 	}