Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260622' into dev_jzg_lipf_v20260622

commons/src/main/java/com/jzg/commons/entity/vo/UserAccountStatisVo.java

@@ -13,13 +13,13 @@ public class UserAccountStatisVo {
     private Integer salespersonCount;
 
     @Schema(description = "应付总计")
-    private Double payableSum;
+    private BigDecimal payableSum;
 
     @Schema(description = "已付总计")
-    private Double paidSum;
+    private BigDecimal paidSum;
 
     @Schema(description = "未付总计")
-    private Double notPaidSum;
+    private BigDecimal notPaidSum;
 
     @Schema(description = "支付中金额总计")
     private BigDecimal payingAmountSum;

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserAccountServiceImpl.java

@@ -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);
             }
@@ -381,8 +383,8 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             if ("0".equals(record.getIncomeAndExpense())) {
                 // 收入
                 summary.setIncome(BigDecimalUtil.add(summary.getIncome(),record.getAmount()));
-            } else {
-                // 支出
+            } else if("1".equals(record.getIncomeAndExpense()) && !"2".equals(record.getStatus())){
+                // 支出, 并且不是审核驳回的数据
                 summary.setExpense(BigDecimalUtil.add(summary.getExpense(),record.getAmount()));
             }