来款审核
This commit is contained in:
+6
-2
@@ -441,8 +441,6 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void check(PayPaymentRecord payPaymentRecord){
|
public void check(PayPaymentRecord payPaymentRecord){
|
||||||
//来款条件校验
|
|
||||||
payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
|
|
||||||
|
|
||||||
BigDecimal newPaidAmount;
|
BigDecimal newPaidAmount;
|
||||||
Integer inAccount;
|
Integer inAccount;
|
||||||
@@ -546,6 +544,9 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
|||||||
|
|
||||||
if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
|
if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
|
||||||
//已同意
|
//已同意
|
||||||
|
//来款条件校验
|
||||||
|
payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
|
||||||
|
|
||||||
newPaidAmount =payPaymentRecordService.addPaidAmount(tbMember.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
|
newPaidAmount =payPaymentRecordService.addPaidAmount(tbMember.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
|
||||||
inAccount = payPaymentRecordService.getInAccount(tbMember.getAmountReceivable(), newPaidAmount);//到账状态
|
inAccount = payPaymentRecordService.getInAccount(tbMember.getAmountReceivable(), newPaidAmount);//到账状态
|
||||||
tbMember.setPaidAmount(newPaidAmount);
|
tbMember.setPaidAmount(newPaidAmount);
|
||||||
@@ -600,6 +601,9 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
|||||||
|
|
||||||
if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
|
if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
|
||||||
//已同意
|
//已同意
|
||||||
|
//来款条件校验
|
||||||
|
payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
|
||||||
|
|
||||||
newPaidAmount =payPaymentRecordService.addPaidAmount(tbMemberCertificate.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
|
newPaidAmount =payPaymentRecordService.addPaidAmount(tbMemberCertificate.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
|
||||||
inAccount = payPaymentRecordService.getInAccount(tbMemberCertificate.getAmountReceivable(), newPaidAmount);//到账状态
|
inAccount = payPaymentRecordService.getInAccount(tbMemberCertificate.getAmountReceivable(), newPaidAmount);//到账状态
|
||||||
tbMemberCertificate.setPaidAmount(newPaidAmount);
|
tbMemberCertificate.setPaidAmount(newPaidAmount);
|
||||||
|
|||||||
Reference in New Issue
Block a user