diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java index 672e644..73cb064 100755 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java @@ -181,11 +181,11 @@ public class TenantServiceImpl implements TenantService { } // 开通测试套餐扣除测试账号数 if (tenantAgencyPackageDO.getPackageType().equals(PackageTypeEnum.TEST.getValue())){ - balanceService.reduceTestAccountNum(currentTenantId); + balanceService.reduceTestAccountNum(currentTenantId, createReqVO.getRemark()); } if (!tenantAgencyPackageDO.getPackageType().equals(PackageTypeEnum.AGENCY.getValue()) && !tenantAgencyPackageDO.getPackageType().equals(PackageTypeEnum.TEST.getValue())) { - balanceService.addTestAccountNum(currentTenantId); + balanceService.addTestAccountNum(currentTenantId, createReqVO.getRemark()); } // 在新创建的租户上下文中执行管理员初始化操作 diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenantbalance/TenantBalanceService.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenantbalance/TenantBalanceService.java index 7a0c201..adb7886 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenantbalance/TenantBalanceService.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenantbalance/TenantBalanceService.java @@ -69,7 +69,7 @@ public interface TenantBalanceService { Boolean consumption(Long PackageId, Long targetTenantId,String remark); - Boolean reduceTestAccountNum(Long currentTenantId); + Boolean reduceTestAccountNum(Long currentTenantId, String remark); - Boolean addTestAccountNum(Long currentTenantId); + Boolean addTestAccountNum(Long currentTenantId, String remark); } \ No newline at end of file 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 792b1c0..4046ea6 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 @@ -359,7 +359,7 @@ public class TenantBalanceServiceImpl implements TenantBalanceService { } @Override - public Boolean reduceTestAccountNum(Long currentTenantId) { + public Boolean reduceTestAccountNum(Long currentTenantId,String remark) { TenantBalanceDO tenantBalanceDO = tenantBalanceMapper.selectById(currentTenantId); if (tenantBalanceDO.getTestAccountNum()<=0) { throw exception(TENANT_BALANCE_TEST_ACCOUNT_NUM_NOT_ENOUGH); @@ -383,6 +383,7 @@ public class TenantBalanceServiceImpl implements TenantBalanceService { tenantPointsDO.setOperatorId(loginUserId); // 设置操作人ID tenantPointsDO.setType(CONSUMPTION.getDesc()); // 设置交易类型为转账 tenantPointsDO.setDescription("开通测试账户"); // 设置交易描述 + tenantPointsDO.setRemark(remark); tenantPointsDO.setBizNo(consumption); // 设置业务流水号 int tenantInsert = tenantPointsMapper.insert(tenantPointsDO); // 插入记录 if (tenantInsert == 0) { @@ -392,7 +393,7 @@ public class TenantBalanceServiceImpl implements TenantBalanceService { } @Override - public Boolean addTestAccountNum(Long currentTenantId) { + public Boolean addTestAccountNum(Long currentTenantId,String remark) { TenantBalanceDO tenantBalanceDO = tenantBalanceMapper.selectById(currentTenantId); Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); @@ -417,6 +418,7 @@ public class TenantBalanceServiceImpl implements TenantBalanceService { tenantPointsDO.setType(BONUS.getDesc()); // 设置交易类型为转账 tenantPointsDO.setDescription("开通测试账户,增加测试账号数量"); // 设置交易描述 tenantPointsDO.setBizNo(bonus); // 设置业务流水号 + tenantPointsDO.setRemark(remark); int tenantInsert = tenantPointsMapper.insert(tenantPointsDO); // 插入记录 if (tenantInsert == 0) { throw exception(TENANT_BALANCE_CONSUMPTION_OPERATION_ERROR);