From 44ccad49867e7ce5b70007e247695971746955c0 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 27 Mar 2024 14:27:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2082926=20=E6=89=80=E6=9C=89=E8=B4=B9?=
 =?UTF-8?q?=E7=94=A8=E9=83=BD=E6=98=AF0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMeetingSituationServiceImpl.java       | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index 0c87f438..cf51cf29 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -1244,6 +1244,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             //打包时不需要上传付款凭证
             if (Objects.equals(payMode,MeetingSubitemCommon.PAY_MODE_3)) {
                 isZero = true;
+                amountReceivable = new BigDecimal("0.00");
+                payMeetingSituation1.setAmountReceivable(new BigDecimal("0.00"));
+                payMeetingSituation.setAmountReceivable(new BigDecimal("0.00"));
             }
             payMeetingSituation1.setIsZero(isZero);
             payMeetingSituation1.setPayMode(payMode);
@@ -1419,10 +1422,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                 payMeetingSituation1.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_1);
             }
         }
-        //打包时待确收金额为0
-        if (Objects.equals(payMeetingSituation1.getPayMode(), MeetingSubitemCommon.PAY_MODE_3)) {
-            payMeetingSituation1.setAmountReceivable(new BigDecimal("0.00"));
-        }
         return payMeetingSituation1;
     }