From 5e2c71ca40abfe548b4d6fa4932a49c1a59e395a Mon Sep 17 00:00:00 2001
From: liangqitao <12345678>
Date: Thu, 16 Dec 2021 14:11:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=96=B0=E5=A2=9E=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/project/service/impl/PayCommonProjectServiceImpl.java | 3 ++-
 .../service/impl/PayWorkingGroupSubItemServiceImpl.java        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
index f54db85d..324ffd1c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
@@ -110,7 +110,8 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
         payCommonProject.setMakeInvoice(PayProjectCommon.MAKE_INVOICE0);
         payCommonProject.setMail(PayProjectCommon.MAIL0);
         payCommonProject.setPack(PayProjectCommon.PACKAGING0);
-        if(payCommonProject.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
+        if(!Objects.isNull(payCommonProject.getReceivableAmount())
+                && payCommonProject.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
             payCommonProject.setPaymentStatus(PaymentStatusEnum.TO_BE_UPLOADED.getCode());
         }
         payCommonProjectService.save(payCommonProject);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
index bf1dd8a1..f50beef6 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
@@ -202,7 +202,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
                 paySendContactsMessageDTO.setUserId(payWorkingGroup.getPrincipalIdA());
                 paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0);
                 // 项目的应收金额＞0 发送缴费通知
-                if(payWorkingGroupSubItem.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
+                if(!Objects.isNull(payWorkingGroupSubItem.getReceivableAmount()) && payWorkingGroupSubItem.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
                     paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1);
                 }
                 contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);