From 7d6e7cfa660eedcc2277a227530135e3b257d370 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 6 Aug 2024 16:45:17 +0800
Subject: [PATCH] =?UTF-8?q?fix=2088086=20=E4=BC=81=E4=B8=9A=E7=AB=AF--?=
 =?UTF-8?q?=E8=B5=84=E6=96=99=E7=BD=91=E9=A1=B5--=E7=BC=B4=E8=B4=B9?=
 =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=8A=B6=E6=80=81=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/service/IPayMemberProjectSubitemService.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java
index e59fbb62..53b1fade 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java
@@ -27,6 +27,7 @@ import com.jero.member.mapper.PayMemberProjectMapper;
 import com.jero.member.mapper.PayMemberProjectSubitemMapper;
 import com.jero.pack.entity.PayPackCompanyProject;
 import com.jero.pack.service.IPayPackCompanyProjectService;
+import com.jero.payment.service.IPayPaymentCheckService;
 import com.jero.project.common.PayProjectCommon;
 import com.jero.project.entity.AnnualDataLocking;
 import com.jero.project.service.AnnualDataLockingService;
@@ -82,6 +83,8 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
 	private IPayMailBillService payMailBillService;
 	@Resource
 	private AnnualDataLockingService annualDataLockingService;
+	@Resource
+	private IPayPaymentCheckService payPaymentCheckService;
 	/**
 	 * 保存
 	 */
@@ -113,6 +116,10 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
 		payMemberProjectSubitem.setMakeInvoice(PayProjectCommon.MAKE_INVOICE0);
 		//邮寄
 		payMemberProjectSubitem.setMail(PayProjectCommon.MAIL0);
+		BigDecimal amountReceivable = payMemberProjectSubitem.getAmountReceivable();
+		if (amountReceivable != null && amountReceivable.compareTo(BigDecimal.ZERO) >0){
+			payMemberProjectSubitem.setPaymentStatus(PayProjectCommon.PAYMENT_STATUS);
+		}
 		save(payMemberProjectSubitem);
 		// 来款方式为合同，校验合同编号
 		if(Objects.equals(payMemberProjectSubitem.getPaymentMethod(),PayProjectCommon.CHARGE_WAY2)){
@@ -145,7 +152,7 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
 			paySendContactsMessageDTO.setUserId(memberProject.getDirectorId());
 			paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0);
 			// 项目的待确收金额＞0 发送缴费通知
-			if(payMemberProjectSubitem.getAmountReceivable().compareTo(new BigDecimal("0")) > 0){
+			if(amountReceivable.compareTo(new BigDecimal("0")) > 0){
 				paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1);
 			}
 			JSONObject json = new JSONObject();