Selaa lähdekoodia

修复账户流水分页空指针异常

24282 2 vuotta sitten
vanhempi
commit
5d7f4dc184

+ 10 - 4
hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRunningWaterServiceImpl.java

@@ -110,16 +110,22 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
     public Page<AccountRunningWaterVo> getPage1(AccountRunningWaterSelectDto dto) {
         Assert.notEmpty(dto.getAccountManagementId(), "资金账户不能为空");
         Assert.notEmpty(dto.getCurrency(), "币种不能为空");
-        //获取账户余额
+        // 获取账户余额
         AccountRemainder accountRemainder = accountRemainderService.getOne(q -> q
                 .eq(AccountRemainder::getAccountManagementId, dto.getAccountManagementId())
                 .eq(AccountRemainder::getCurrency, dto.getCurrency()));
-        BigDecimal remainder = accountRemainder.getRemainder();
+
+        BigDecimal remainder;
+        if (accountRemainder == null) {
+            remainder = BigDecimal.ZERO;
+        } else {
+            remainder = accountRemainder.getRemainder();
+        }
 
         QueryWrapper<Object> wrapper = Wrappers.query();
-        //资金账户
+        // 资金账户
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getAccountManagementId()), "arw.account_management_id", dto.getAccountManagementId());
-        //币种
+        // 币种
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getCurrency()), "arw.currency", dto.getCurrency());
         wrapper.orderByDesc("arw.transaction_time");
         Page<AccountRunningWaterVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);