ziin/vvDataAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(system): 为租户测试账号操作增加备注参数

Browse Source
This commit is contained in:
ziin
2025-11-25 16:20:23 +08:00
parent bfc2b21872
commit a4ce439f7c
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java
View File

@@ -181,11 +181,11 @@ public class TenantServiceImpl implements TenantService {
} }
// 开通测试套餐扣除测试账号数 // 开通测试套餐扣除测试账号数
if (tenantAgencyPackageDO.getPackageType().equals(PackageTypeEnum.TEST.getValue())){ if (tenantAgencyPackageDO.getPackageType().equals(PackageTypeEnum.TEST.getValue())){
balanceService.reduceTestAccountNum(currentTenantId); balanceService.reduceTestAccountNum(currentTenantId, createReqVO.getRemark());
} }
if (!tenantAgencyPackageDO.getPackageType().equals(PackageTypeEnum.AGENCY.getValue()) if (!tenantAgencyPackageDO.getPackageType().equals(PackageTypeEnum.AGENCY.getValue())
&& !tenantAgencyPackageDO.getPackageType().equals(PackageTypeEnum.TEST.getValue())) { && !tenantAgencyPackageDO.getPackageType().equals(PackageTypeEnum.TEST.getValue())) {
balanceService.addTestAccountNum(currentTenantId); balanceService.addTestAccountNum(currentTenantId, createReqVO.getRemark());
} }
// 在新创建的租户上下文中执行管理员初始化操作 // 在新创建的租户上下文中执行管理员初始化操作

4
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenantbalance/TenantBalanceService.java
View File

@@ -69,7 +69,7 @@ public interface TenantBalanceService {
Boolean consumption(Long PackageId, Long targetTenantId,String remark); 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);
} }

6
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenantbalance/TenantBalanceServiceImpl.java
View File

@@ -359,7 +359,7 @@ public class TenantBalanceServiceImpl implements TenantBalanceService {
} }
@Override @Override
public Boolean reduceTestAccountNum(Long currentTenantId) { public Boolean reduceTestAccountNum(Long currentTenantId,String remark) {
TenantBalanceDO tenantBalanceDO = tenantBalanceMapper.selectById(currentTenantId); TenantBalanceDO tenantBalanceDO = tenantBalanceMapper.selectById(currentTenantId);
if (tenantBalanceDO.getTestAccountNum()<=0) { if (tenantBalanceDO.getTestAccountNum()<=0) {
throw exception(TENANT_BALANCE_TEST_ACCOUNT_NUM_NOT_ENOUGH); throw exception(TENANT_BALANCE_TEST_ACCOUNT_NUM_NOT_ENOUGH);
@@ -383,6 +383,7 @@ public class TenantBalanceServiceImpl implements TenantBalanceService {
tenantPointsDO.setOperatorId(loginUserId); // 设置操作人ID tenantPointsDO.setOperatorId(loginUserId); // 设置操作人ID
tenantPointsDO.setType(CONSUMPTION.getDesc()); // 设置交易类型为转账 tenantPointsDO.setType(CONSUMPTION.getDesc()); // 设置交易类型为转账
tenantPointsDO.setDescription("开通测试账户"); // 设置交易描述 tenantPointsDO.setDescription("开通测试账户"); // 设置交易描述
tenantPointsDO.setRemark(remark);
tenantPointsDO.setBizNo(consumption); // 设置业务流水号 tenantPointsDO.setBizNo(consumption); // 设置业务流水号
int tenantInsert = tenantPointsMapper.insert(tenantPointsDO); // 插入记录 int tenantInsert = tenantPointsMapper.insert(tenantPointsDO); // 插入记录
if (tenantInsert == 0) { if (tenantInsert == 0) {
@@ -392,7 +393,7 @@ public class TenantBalanceServiceImpl implements TenantBalanceService {
} }
@Override @Override
public Boolean addTestAccountNum(Long currentTenantId) { public Boolean addTestAccountNum(Long currentTenantId,String remark) {
TenantBalanceDO tenantBalanceDO = tenantBalanceMapper.selectById(currentTenantId); TenantBalanceDO tenantBalanceDO = tenantBalanceMapper.selectById(currentTenantId);
Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
@@ -417,6 +418,7 @@ public class TenantBalanceServiceImpl implements TenantBalanceService {
tenantPointsDO.setType(BONUS.getDesc()); // 设置交易类型为转账 tenantPointsDO.setType(BONUS.getDesc()); // 设置交易类型为转账
tenantPointsDO.setDescription("开通测试账户,增加测试账号数量"); // 设置交易描述 tenantPointsDO.setDescription("开通测试账户,增加测试账号数量"); // 设置交易描述
tenantPointsDO.setBizNo(bonus); // 设置业务流水号 tenantPointsDO.setBizNo(bonus); // 设置业务流水号
tenantPointsDO.setRemark(remark);
int tenantInsert = tenantPointsMapper.insert(tenantPointsDO); // 插入记录 int tenantInsert = tenantPointsMapper.insert(tenantPointsDO); // 插入记录
if (tenantInsert == 0) { if (tenantInsert == 0) {
throw exception(TENANT_BALANCE_CONSUMPTION_OPERATION_ERROR); throw exception(TENANT_BALANCE_CONSUMPTION_OPERATION_ERROR);