diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index eac4fd02..8fb744ec 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -119,9 +119,10 @@ public class PayMailBillServiceImpl extends ServiceImpl0){ return "标协会员项目,只能来款一次。"; } + + TbMemberProjectSubitem tbMemberInsert = tbMemberProjectSubitemMapper.selectById(payPaymentRecord.getProjectId()); + + BigDecimal rAInsert = tbMemberInsert.getAmountReceivable();//应收 + BigDecimal pAInsert = tbMemberInsert.getPaidAmount();//实收 + BigDecimal aRInsert =payPaymentRecord.getAmountReceived();//到账 + //欠款 + BigDecimal debtInsert = rAInsert.subtract(pAInsert); + if(aRInsert.compareTo(debtInsert) != 0){ + return "标协会员项目,到账金额不等于欠款金额。"; + } } payPaymentRecordMapper.insert(payPaymentRecord); return "success"; @@ -200,15 +227,19 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl实收>0 + if(receivableAmount.compareTo(paidAmount) == 1 && paidAmount!=null && paidAmount.compareTo(zero)==1){ + return 2; + } + //应收=实收 + if(receivableAmount.compareTo(paidAmount) == 0){ + return 1; + } + //实收=0 + if(paidAmount.compareTo(zero)==0){ + return 0; + }else{ + return 4; + } + + } }