|
|
@@ -91,6 +91,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
|
|
|
UserAccountStatisVo payableStatistics = this.baseMapper.getPayableStatistics(param);
|
|
|
BigDecimal payingAmountSum = sysAmountAuditingMapper.queryPayingAmountSum();
|
|
|
payableStatistics.setPayingAmountSum(payingAmountSum== null? BigDecimal.ZERO:payingAmountSum);
|
|
|
+ payableStatistics.setNotPaidSum(BigDecimalUtil.subtract(payableStatistics.getNotPaidSum(),payableStatistics.getPayingAmountSum()));
|
|
|
return payableStatistics;
|
|
|
}
|
|
|
|
|
|
@@ -113,6 +114,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
|
|
|
List<SysAmountAuditing> sysAmountAuditings1 = collect.get(userId);
|
|
|
if(CollUtil.isNotEmpty(sysAmountAuditings1)){
|
|
|
action.setPayingAmount(sysAmountAuditings1.get(0).getAmount());
|
|
|
+ action.setSumAmountUnpaid(BigDecimalUtil.subtract(action.getSumAmountUnpaid(),sysAmountAuditings1.get(0).getAmount()));
|
|
|
}else{
|
|
|
action.setPayingAmount(BigDecimal.ZERO);
|
|
|
}
|