From 9d009599421dcf27faca05752e03f686f77fb4c2 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 2 Nov 2023 09:52:37 +0800
Subject: [PATCH] =?UTF-8?q?add=20Wasic=E5=9B=BD=E9=99=85=E7=A0=94=E8=AE=A8?=
 =?UTF-8?q?=E4=BC=9A=E5=A2=9E=E5=8A=A0=E6=8A=A5=E5=90=8D=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/service/impl/SendMessageServiceImpl.java    |  2 +-
 .../service/impl/PayMeetingSituationServiceImpl.java   | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java
index 2b41eee3..c4c2e0eb 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java
@@ -488,7 +488,7 @@ public class SendMessageServiceImpl implements SendMessageService {
                         //	中汽中心标准院-企业端-会议通知-24
                         sender = "8821092414406";
                         signature = "中汽中心标准院";
-                        templateId =  "1dfe235047184c3a9c8d7b5652b6b635";
+                        templateId =  "1eafad16964f4b629ec961f5fb72fe81";
                         break;
                     default:
                         throw new JeroBootException("codeType flase.");
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 91bd0cd7..069a5dad 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,13 +1217,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                     if (!linkTopicList.containsAll(choiceTopicList)) {
                         throw new JeroBootException("课题名称选择错误");
                     }
-                    for (int i = 0; i < choiceTopicList.size(); i++) {
-                        String s = choiceTopicList.get(i);
-                        if ("6".equals(s)){
-                            choiceTopicList.remove(i);
-                            break;
-                        }
-                    }
+                    //两个免费会议去除
+                    choiceTopicList.removeIf(next -> "6".equals(next) || "8".equals(next));
+
                     //根据选择的课题数量，存入金额
                     if (choiceTopicList.size() <= 2){
                         amountReceivable = payMeeting.getMeetingCostsTwoTopic();