From b11abd83fa598d105ba73355de987234f202065e Mon Sep 17 00:00:00 2001 From: baozhipeng <961815525@qq.com> Date: Wed, 15 Dec 2021 20:31:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/service/impl/PayPaymentCheckServiceImpl.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java index 4c9054e7..61c94bdb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java @@ -161,15 +161,14 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl 0 - && paidAmount.compareTo(amountReceivable) < 0 + // 实收金额 < 应收金额 && 不等于待审核/已拒绝 + if(paidAmount.compareTo(amountReceivable) < 0 && !PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(paymentStatus) && !PaymentStatusEnum.REJECTED.getCode().equals(paymentStatus)){ paymentStatus = PaymentStatusEnum.TO_BE_UPLOADED.getCode();//待上传 } - // 0 < 实收金额 && 实收金额 == 应收金额 - if(paidAmount.compareTo(new BigDecimal("0.00")) > 0 + // 应收>0 && 实收金额 == 应收金额 + if(amountReceivable.compareTo(new BigDecimal("0.00")) > 0 && paidAmount.compareTo(amountReceivable) == 0){ paymentStatus = PaymentStatusEnum.COMPLETED.getCode();//待完结 }