From a9e8cdbf849b9328dbaf2a599391e89741f2f80a Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 18 Oct 2021 15:06:05 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=2040789=20=E5=85=B6=E4=BB=96=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE-=E6=96=B0=E5=A2=9E=E5=8F=82=E4=BC=9A=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=BA=E6=89=93=E5=8C=85=E6=97=B6=EF=BC=8C=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E6=9C=89=E9=97=AE=E9=A2=98=EF=BC=88=E5=85=B6=E4=BB=96=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E4=B9=9F=E6=9C=89=E5=90=8C=E6=A0=B7=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMeetingSituationServiceImpl.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 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 c0c7c666..1a12824a 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
@@ -165,7 +165,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         }
 
         //处理打包情况
-        handlePack(payMeetingSituation1);
+        //handlePack(payMeetingSituation1);
     }
 
     /**
@@ -281,7 +281,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         PayMeetingSituation payMeetingSituation1 = getPayMeetingSituation(payMeetingSituation);
         saveMeetingSituation(payMeetingSituation1);
         //处理打包
-        handlePack(payMeetingSituation1);
+        //handlePack(payMeetingSituation1);
         Integer identity = payMeetingSituation1.getIdentity();
         //判断是否发送消息，工作组和分标委特殊处理
         if (meetingType.equals(Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING))
@@ -752,7 +752,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
         }
         //处理打包情况
-        handlePack(payMeetingSituation1);
+        //handlePack(payMeetingSituation1);
     }
 
     /**
@@ -847,8 +847,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_3)) {
                 ValidUtil.validate(commonPeopleVO);
                 //存入打包字段
-                payMeetingSituation1.setPack(PayProjectCommon.PACKAGING1);
-                payMeetingSituation1.setAmountReceivable(new BigDecimal(0));
+                //payMeetingSituation1.setPack(PayProjectCommon.PACKAGING1);
+                payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCosts());
                 //缴费方式为汇款或线上缴费
             } else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1)
                     || Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)) {