Compare commits

..

No commits in common. "690bc43a55bdc1fb05a8a4e11ce4196e4e953395" and "f98ceb57856c0d2565c879168c2d4a8f82e10604" have entirely different histories.

2 changed files with 5 additions and 6 deletions

View File

@ -86,8 +86,5 @@ 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";
} }
} }

View File

@ -78,7 +78,9 @@ public class DeptUserScoreTransferTxService {
} }
String orderNum = buildOrderNum(); String orderNum = buildOrderNum();
aiUserService.addUserBalance(orderNum, user.getId(), amount.negate(), BalanceChangerConstants.DEPT_SCORE_RECLAIM, request.getRemark()); String remark = buildRemark(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) {
@ -86,7 +88,7 @@ public class DeptUserScoreTransferTxService {
} }
BigDecimal deptBalAfter = getDeptBalance(deptId); BigDecimal deptBalAfter = getDeptBalance(deptId);
insertGroupRecord(orderNum, deptId, GroupBalanceChangeType.RECLAIM.getCode(), amount, deptBalAfter, request.getRemark()); insertGroupRecord(orderNum, deptId, GroupBalanceChangeType.RECLAIM.getCode(), amount, deptBalAfter, remark);
} }
private AiUser requireUserWithDept(Long id) { private AiUser requireUserWithDept(Long id) {
@ -142,6 +144,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 BalanceChangerConstants.OrderNoPrefix.ISSUE_RECLAIM_PREFIX + dateTime + uuid; return "DU" + dateTime + uuid;
} }
} }