From cf6290d3b4e7a3d85d2c0fc78a3e26a8dbe883c7 Mon Sep 17 00:00:00 2001 From: ziin Date: Fri, 21 Nov 2025 21:23:57 +0800 Subject: [PATCH] =?UTF-8?q?refactor(system):=20=E6=8B=86=E5=88=86=E8=BD=AC?= =?UTF-8?q?=E8=B4=A6=E6=9E=9A=E4=B8=BE=E4=B8=BA=E8=BD=AC=E5=85=A5=E4=B8=8E?= =?UTF-8?q?=E8=BD=AC=E5=87=BA=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/system/enums/balance/BalanceEnum.java | 3 ++- .../service/tenantbalance/TenantBalanceServiceImpl.java | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/balance/BalanceEnum.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/balance/BalanceEnum.java index 6d11b12..87511b4 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/balance/BalanceEnum.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/balance/BalanceEnum.java @@ -15,7 +15,8 @@ public enum BalanceEnum { RECHARGE("充值"), - TRANSFER("转账"), + TRANSFER_OUT("转出"), + TRANSFER_IN("转入"), CONSUMPTION("消费"); diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenantbalance/TenantBalanceServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenantbalance/TenantBalanceServiceImpl.java index 07b8e98..400c6b8 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenantbalance/TenantBalanceServiceImpl.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenantbalance/TenantBalanceServiceImpl.java @@ -17,6 +17,7 @@ import cn.iocoder.yudao.module.system.service.user.AdminUserService; import cn.iocoder.yudao.module.system.util.BizNoGenerator; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.mzt.logapi.starter.annotation.LogRecord; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; @@ -26,8 +27,7 @@ import java.util.List; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; -import static cn.iocoder.yudao.module.system.enums.balance.BalanceEnum.RECHARGE; -import static cn.iocoder.yudao.module.system.enums.balance.BalanceEnum.TRANSFER; +import static cn.iocoder.yudao.module.system.enums.balance.BalanceEnum.*; /** * 租户余额 Service 实现类 @@ -237,7 +237,7 @@ public class TenantBalanceServiceImpl implements TenantBalanceService { tenantPointsDO.setPoints(-transferReqVO.getTransferAmount()); // 设置变动积分（负数表示减少） tenantPointsDO.setBalance(tenantNewBalance); // 设置变动后的余额 tenantPointsDO.setOperatorId(loginUserId); // 设置操作人ID - tenantPointsDO.setType(TRANSFER.getDesc()); // 设置交易类型为转账 + tenantPointsDO.setType(TRANSFER_OUT.getDesc()); // 设置交易类型为转账 tenantPointsDO.setDescription("转账给租户" + transferReqVO.getTargetTenantId() + "，金额：" + transferReqVO.getTransferAmount()); // 设置交易描述 tenantPointsDO.setTargetTenantId(transferReqVO.getTargetTenantId()); // 设置目标租户ID tenantPointsDO.setBizNo(transfer); // 设置业务流水号 @@ -250,7 +250,7 @@ public class TenantBalanceServiceImpl implements TenantBalanceService { targetPointsDO.setPoints(transferReqVO.getTransferAmount()); // 设置变动积分（正数表示增加） targetPointsDO.setBalance(targetTenantNewBalance); // 设置变动后的余额 targetPointsDO.setOperatorId(loginUserId); // 设置操作人ID - targetPointsDO.setType(TRANSFER.getDesc()); // 设置交易类型为转账 + targetPointsDO.setType(TRANSFER_IN.getDesc()); // 设置交易类型为转账 targetPointsDO.setTargetTenantId(tenantId);// 设置目标租户ID targetPointsDO.setDescription("转账来自租户" + tenantId + "，金额：" + transferReqVO.getTransferAmount()); // 设置交易描述 targetPointsDO.setBizNo(transfer); // 设置业务流水号（与转出方使用同一个流水号）