From 4a55202d35d44bda85e5efc261e74ad19b4f4968 Mon Sep 17 00:00:00 2001 From: yys <47@gamerwa.com> Date: Mon, 20 Apr 2026 16:48:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=A2=E9=98=9F=E4=BD=99=E9=A2=9Dbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/common/constant/BalanceChangerConstants.java | 3 +++ .../ai/service/impl/DeptUserScoreTransferTxService.java | 8 +++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/web-api/ruoyi-common/src/main/java/com/ruoyi/common/constant/BalanceChangerConstants.java b/web-api/ruoyi-common/src/main/java/com/ruoyi/common/constant/BalanceChangerConstants.java index e141eb5..ad39737 100644 --- a/web-api/ruoyi-common/src/main/java/com/ruoyi/common/constant/BalanceChangerConstants.java +++ b/web-api/ruoyi-common/src/main/java/com/ruoyi/common/constant/BalanceChangerConstants.java @@ -86,5 +86,8 @@ public class BalanceChangerConstants { public static class OrderNoPrefix { // 团队充值、退款订单号前缀 public static final String RECHARGE_REFUND_PREFIX = "RE"; + + // 团队积分下放、回收单号前缀 + public static final String ISSUE_RECLAIM_PREFIX = "IS"; } } diff --git a/web-api/ruoyi-system/src/main/java/com/ruoyi/ai/service/impl/DeptUserScoreTransferTxService.java b/web-api/ruoyi-system/src/main/java/com/ruoyi/ai/service/impl/DeptUserScoreTransferTxService.java index d728ca5..960262e 100644 --- a/web-api/ruoyi-system/src/main/java/com/ruoyi/ai/service/impl/DeptUserScoreTransferTxService.java +++ b/web-api/ruoyi-system/src/main/java/com/ruoyi/ai/service/impl/DeptUserScoreTransferTxService.java @@ -78,9 +78,7 @@ public class DeptUserScoreTransferTxService { } String orderNum = buildOrderNum(); - String remark = buildRemark(request.getRemark(), "用户积分回收至部门"); - - aiUserService.addUserBalance(orderNum, user.getId(), amount.negate(), BalanceChangerConstants.DEPT_SCORE_RECLAIM, remark); + aiUserService.addUserBalance(orderNum, user.getId(), amount.negate(), BalanceChangerConstants.DEPT_SCORE_RECLAIM, request.getRemark()); int rows = deptService.addDeptBalance(deptId, amount); if (rows == 0) { @@ -88,7 +86,7 @@ public class DeptUserScoreTransferTxService { } 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) { @@ -144,6 +142,6 @@ public class DeptUserScoreTransferTxService { private static String buildOrderNum() { String uuid = UUID.randomUUID().toString().replace("-", "").substring(0, 8); String dateTime = new SimpleDateFormat("yyyyMMdd").format(new Date()); - return "DU" + dateTime + uuid; + return BalanceChangerConstants.OrderNoPrefix.ISSUE_RECLAIM_PREFIX + dateTime + uuid; } }