WFC/be.wfc
2
0
Fork 0
Code Activity

fix: 修复dashboard接口

Browse Source
This commit is contained in:
caiyuchao
2025-01-10 16:30:42 +08:00
parent 469607fef0
commit a8131f63b4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java
View File

@@ -246,8 +246,8 @@ public class UAccountServiceImpl extends ServiceImpl<UAccountMapper, UAccount> i
BeanUtils.copyProperties(account, dashboardVo); BeanUtils.copyProperties(account, dashboardVo);
dashboardVo.setId(loginUser.getUserid()); dashboardVo.setId(loginUser.getUserid());
dashboardVo.setActivity(0L); dashboardVo.setActivity(0L);
BigDecimal balanceUsed = Optional.of(account.getBalanceUsed()).orElse(BigDecimal.ZERO); BigDecimal balanceUsed = Optional.ofNullable(account.getBalanceUsed()).orElse(BigDecimal.ZERO);
BigDecimal balance = Optional.of(dashboardVo.getBalance()).orElse(BigDecimal.ZERO); BigDecimal balance = Optional.ofNullable(dashboardVo.getBalance()).orElse(BigDecimal.ZERO);
if (balance.compareTo(balanceUsed) >= 0) { if (balance.compareTo(balanceUsed) >= 0) {
dashboardVo.setBalance(balance.subtract(balanceUsed)); dashboardVo.setBalance(balance.subtract(balanceUsed));
} else { } else {

2
wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UOrderServiceImpl.java
View File

@@ -90,7 +90,7 @@ public class UOrderServiceImpl extends ServiceImpl<UOrderMapper, UOrder> impleme
} else if (OrderTypeEnum.RECHARGE.getCode().equals(order.getType())) { } else if (OrderTypeEnum.RECHARGE.getCode().equals(order.getType())) {
// 充值 // 充值
// 更新账户余额 // 更新账户余额
account.setBalance(order.getOrderAmount().add(Optional.of(account.getBalance()).orElse(BigDecimal.ZERO))); account.setBalance(order.getOrderAmount().add(Optional.ofNullable(account.getBalance()).orElse(BigDecimal.ZERO)));
} }
account.setId(accountId); account.setId(accountId);
accountService.saveOrUpdate(account); accountService.saveOrUpdate(account);