From e804d586aeaba5233218aed1ed0d9e8ce93bd3f9 Mon Sep 17 00:00:00 2001
From: baozhipeng <961815525@qq.com>
Date: Wed, 15 Dec 2021 19:42:07 +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

---
 .../service/impl/PayPaymentCheckServiceImpl.java    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 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 94ed0d92..228cd47e 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
@@ -186,12 +186,19 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
      */
     @Override
     public String getPaymentStatus(BigDecimal amountReceivable,BigDecimal paidAmount,String paymentStatus){
+        if(amountReceivable == null){
+            amountReceivable = new BigDecimal("0.00");
+        }
+        if(paidAmount == null){
+            paidAmount = new BigDecimal("0.00");
+        }
+
         // 0 < 实收金额 && 实收金额 < 应收金额 && 不等于待审核/已拒绝
         if(paidAmount.compareTo(new BigDecimal("0.00")) > 0
                 && paidAmount.compareTo(amountReceivable) < 0
-                && PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(paymentStatus)
-                && PaymentStatusEnum.REJECTED.getCode().equals(paymentStatus)){
-            paymentStatus = PaymentStatusEnum.TO_BE_UPLOADED.getCode();
+                && !PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(paymentStatus)
+                && !PaymentStatusEnum.REJECTED.getCode().equals(paymentStatus)){
+            paymentStatus = PaymentStatusEnum.TO_BE_UPLOADED.getCode();//待上传
         }
         return paymentStatus;
     }