best_yunwei
/
ai_images
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/seedance_balance' into seedance_balance

This commit is contained in:
old burden 2026-04-20 16:55:32 +08:00
parent 6600f4f1f9 690bc43a55
commit 009886d9d8
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web-api/ruoyi-common/src/main/java/com/ruoyi/common/constant/BalanceChangerConstants.java
View File

@ -86,5 +86,8 @@ public class BalanceChangerConstants {
public static class OrderNoPrefix { public static class OrderNoPrefix {
// 团队充值、退款订单号前缀 // 团队充值、退款订单号前缀
public static final String RECHARGE_REFUND_PREFIX = "RE"; public static final String RECHARGE_REFUND_PREFIX = "RE";
// 团队积分下放、回收单号前缀
public static final String ISSUE_RECLAIM_PREFIX = "IS";
} }
} }

8
web-api/ruoyi-system/src/main/java/com/ruoyi/ai/service/impl/DeptUserScoreTransferTxService.java
View File

@ -78,9 +78,7 @@ public class DeptUserScoreTransferTxService {
} }
String orderNum = buildOrderNum(); String orderNum = buildOrderNum();
String remark = buildRemark(request.getRemark(), "用户积分回收至部门"); aiUserService.addUserBalance(orderNum, user.getId(), amount.negate(), BalanceChangerConstants.DEPT_SCORE_RECLAIM, request.getRemark());
aiUserService.addUserBalance(orderNum, user.getId(), amount.negate(), BalanceChangerConstants.DEPT_SCORE_RECLAIM, remark);
int rows = deptService.addDeptBalance(deptId, amount); int rows = deptService.addDeptBalance(deptId, amount);
if (rows == 0) { if (rows == 0) {
@ -88,7 +86,7 @@ public class DeptUserScoreTransferTxService {
} }
BigDecimal deptBalAfter = getDeptBalance(deptId); BigDecimal deptBalAfter = getDeptBalance(deptId);
insertGroupRecord(orderNum, deptId, GroupBalanceChangeType.RECLAIM.getCode(), amount, deptBalAfter, remark); insertGroupRecord(orderNum, deptId, GroupBalanceChangeType.RECLAIM.getCode(), amount, deptBalAfter, request.getRemark());
} }
private AiUser requireUserWithDept(Long id) { private AiUser requireUserWithDept(Long id) {
@ -144,6 +142,6 @@ public class DeptUserScoreTransferTxService {
private static String buildOrderNum() { private static String buildOrderNum() {
String uuid = UUID.randomUUID().toString().replace("-", "").substring(0, 8); String uuid = UUID.randomUUID().toString().replace("-", "").substring(0, 8);
String dateTime = new SimpleDateFormat("yyyyMMdd").format(new Date()); String dateTime = new SimpleDateFormat("yyyyMMdd").format(new Date());
return "DU" + dateTime + uuid; return BalanceChangerConstants.OrderNoPrefix.ISSUE_RECLAIM_PREFIX + dateTime + uuid;
} }
} }