From d976aead976e249b1be2cb80bb105f0b8fcd610d Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 2 Nov 2023 16:06:05 +0800
Subject: [PATCH] =?UTF-8?q?update=20Wasic=E5=9B=BD=E9=99=85=E7=A0=94?=
 =?UTF-8?q?=E8=AE=A8=E4=BC=9A=20=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=9C=89=E4=B8=A4=E4=B8=AA=E5=B0=8F=E4=BC=9A=E8=AE=AE=20?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayMeetingSituationServiceImpl.java        | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 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 069a5dad..0e4c3170 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
@@ -1217,16 +1217,15 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                     if (!linkTopicList.containsAll(choiceTopicList)) {
                         throw new JeroBootException("课题名称选择错误");
                     }
-                    //两个免费会议去除
-                    choiceTopicList.removeIf(next -> "6".equals(next) || "8".equals(next));
-
+                    //免费会议去除
+                    choiceTopicList.removeIf(next -> "6".equals(next) || "99".equals(next) || "8".equals(next));
                     //根据选择的课题数量，存入金额
-                    if (choiceTopicList.size() <= 2){
-                        amountReceivable = payMeeting.getMeetingCostsTwoTopic();
-                    }else {
+                    //判断是否有两个小会议
+                    if (choiceTopicList.size() >= 2) {
                         amountReceivable = payMeeting.getMeetingCostsThreeTopic();
+                    }else {
+                        amountReceivable = payMeeting.getMeetingCostsTwoTopic();
                     }
-
                 }else {
                     amountReceivable = payMeeting.getMeetingCosts();
                 }