diff --git a/src/main/java/com/ai/da/controller/AccountController.java b/src/main/java/com/ai/da/controller/AccountController.java index 0300aca0..faeac689 100644 --- a/src/main/java/com/ai/da/controller/AccountController.java +++ b/src/main/java/com/ai/da/controller/AccountController.java @@ -302,7 +302,7 @@ public class AccountController { @ApiOperation(value = "子账号删除") public Response deleteSubAccount(@Valid @RequestBody AddSubAccountDTO addSubAccountDTO) { // return Response.success(accountService.deleteSubAccount(addSubAccountDTO)); - accountService.removeSubAccount(addSubAccountDTO, true); + accountService.removeSubAccount(addSubAccountDTO); return Response.success(); } diff --git a/src/main/java/com/ai/da/service/AccountService.java b/src/main/java/com/ai/da/service/AccountService.java index f0408c3a..bfb792e3 100644 --- a/src/main/java/com/ai/da/service/AccountService.java +++ b/src/main/java/com/ai/da/service/AccountService.java @@ -205,7 +205,7 @@ public interface AccountService extends IService { Boolean deleteSubAccount(AddSubAccountDTO addSubAccountDTO); - void removeSubAccount(AddSubAccountDTO addSubAccountDTO, boolean returnCredits); + void removeSubAccount(AddSubAccountDTO addSubAccountDTO); PageBaseResponse subAccountList(SubAccountPageDTO subAccountPageDTO); diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 72dd6478..2f77d6fb 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -2547,7 +2547,7 @@ public class AccountServiceImpl extends ServiceImpl impl // BigDecimal creditsUsage = exAccountInfo.getCreditsUsage(); addSubAccountDTO.setCreditsUsage(exAccountInfo.getCreditsUsage()); // 这里移除原账号,但是积分不回流,机构分配的积分会由下一个账号继续持有(包括积分上限和已使用的积分都保持不变) - removeSubAccount(new AddSubAccountDTO(Collections.singletonList(addSubAccountDTO.getId())), false); + removeSubAccount(new AddSubAccountDTO(Collections.singletonList(addSubAccountDTO.getId()))); // 移入新子账号(可能是移入,也可能是新增) createSubAccount(addSubAccountDTO, adminAcc, subUserRole); } else { @@ -2632,7 +2632,7 @@ public class AccountServiceImpl extends ServiceImpl impl return Boolean.TRUE; } - public void removeSubAccount(AddSubAccountDTO addSubAccountDTO, boolean returnCredits) { + public void removeSubAccount(AddSubAccountDTO addSubAccountDTO) { Long adminAccId = UserContext.getUserHolder().getId(); Account adminAcc = baseMapper.selectById(adminAccId); if (Objects.isNull(adminAcc) || (adminAcc.getSystemUser() != 5 && adminAcc.getSystemUser() != 7)) { @@ -2667,8 +2667,8 @@ public class AccountServiceImpl extends ServiceImpl impl log.warn("需要移除账号 {}: {} 不属于当前管理员 {}: {}", id, account.getUserEmail(), adminAccId, adminAcc.getUserEmail()); } } - // 是否需要将积分回流 - if (returnCredits && unusedCreditsTotal.compareTo(BigDecimal.ZERO) != 0){ + // 将积分回流 + if (unusedCreditsTotal.compareTo(BigDecimal.ZERO) != 0){ BigDecimal subtracted = adminAcc.getCreditsUsage().subtract(unusedCreditsTotal); adminAcc.setCreditsUsage(subtracted.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : subtracted); adminAcc.setCredits(adminAcc.getCreditsUsageLimit().subtract(adminAcc.getCreditsUsage()));