|
@@ -1109,6 +1109,16 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
//platformCompanyFeeVo.setTotalUnSettlementAmount(BigDecimalUtil.subtract(BigDecimalUtil.subtract(platformCompanyFeeVo.getTotalReceivable(),platformCompanyFeeVo.getTotalSettlementAmount()), platformCompanyFeeVo.getTotalPaymentDifference()));
|
|
//platformCompanyFeeVo.setTotalUnSettlementAmount(BigDecimalUtil.subtract(BigDecimalUtil.subtract(platformCompanyFeeVo.getTotalReceivable(),platformCompanyFeeVo.getTotalSettlementAmount()), platformCompanyFeeVo.getTotalPaymentDifference()));
|
|
|
platformCompanyFeeVo.setTotalUnSettlementAmount(BigDecimalUtil.subtract(platformCompanyFeeVo.getTotalReceivable(),platformCompanyFeeVo.getTotalSettlementAmount()));
|
|
platformCompanyFeeVo.setTotalUnSettlementAmount(BigDecimalUtil.subtract(platformCompanyFeeVo.getTotalReceivable(),platformCompanyFeeVo.getTotalSettlementAmount()));
|
|
|
}
|
|
}
|
|
|
|
|
+ if (StrUtil.isNotBlank(settlementReportQueryVo.getStatus())){
|
|
|
|
|
+ if ("1".equals(settlementReportQueryVo.getStatus())){
|
|
|
|
|
+ // 过滤结算状态
|
|
|
|
|
+ platformCompanyFeeVos = platformCompanyFeeVos.stream().filter(plat -> null != plat.getTotalSettlementAmount() && BigDecimal.ZERO.compareTo(plat.getTotalSettlementAmount()) != 0).toList();
|
|
|
|
|
+ }else if ("0".equals(settlementReportQueryVo.getStatus())){
|
|
|
|
|
+ // 过滤结算状态
|
|
|
|
|
+ platformCompanyFeeVos = platformCompanyFeeVos.stream().filter(plat -> null == plat.getTotalSettlementAmount() || BigDecimal.ZERO.compareTo(plat.getTotalSettlementAmount()) == 0).toList();
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
return platformCompanyFeeVos;
|
|
return platformCompanyFeeVos;
|
|
|
}
|
|
}
|
|
|
|
|
|