From a5f18889ee936b8991ab409415cde40e4042658a Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 26 Oct 2021 15:50:10 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=2041424=20=E5=9C=A8=E6=9D=A5=E6=AC=BE?=
 =?UTF-8?q?=E4=B8=AD=E6=96=B0=E5=BB=BA=E7=9A=84=E4=BC=9A=E8=AE=AE,?=
 =?UTF-8?q?=E5=9C=A8=E4=BC=9A=E5=91=98=E7=9A=84=E9=97=A8=E6=88=B7=E7=AB=AF?=
 =?UTF-8?q?=E4=B8=AD,=E4=BC=9A=E8=AE=AE=E9=80=9A=E7=9F=A5=E5=92=8C?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E6=96=87=E4=BB=B6=E6=B2=A1=E6=9C=89=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMeetingServiceImpl.java   | 50 ++++++++++++++++---
 .../impl/StableCrossTrainingServiceImpl.java  | 26 +---------
 2 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
index 8dac46cd..bca796ec 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
@@ -134,6 +134,18 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
         //新增会员系统标协会议
         if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
             stableCrossTrainingService.add(payMeeting, hotelContactsList);
+            List<String> fileIdList = new ArrayList<>();
+            String meetingFiles = payMeeting.getMeetingFiles();
+            if (StrUtil.isNotBlank(meetingFiles)){
+                List<String> strings = Arrays.asList(meetingFiles.split(","));
+                List<String> arrayList = new ArrayList<>(strings);
+                fileIdList.addAll(arrayList);
+            }
+            String paymentQrCode = payMeeting.getPaymentQrCode();
+            if (StrUtil.isNotBlank(paymentQrCode)){
+                fileIdList.add(paymentQrCode);
+            }
+            pushStandardsFiles(fileIdList);
         }
         //工作组会议发送通知
         if (Objects.equals(payMeeting.getMeetingType(), Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING))) {
@@ -155,6 +167,23 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
         }
     }
 
+    /**
+     * 推送文件到会员系统
+     * @param ids 文件id
+     */
+    private void pushStandardsFiles(List<String> ids) {
+        if (!ids.isEmpty()){
+            List<OSSFile> ossFiles = iossFileService.listByIds(ids);
+            for (OSSFile ossFile : ossFiles) {
+                String url = ossFile.getUrl();
+                String[] fileUrl = url.split("/");
+                int length = fileUrl.length;
+                ossFile.setFileName(fileUrl[length - 1]);
+            }
+            AuthenticationUtils.post("/stablecrosstraining/stableCrossTraining/addStandardsFile", null, ossFiles);
+        }
+    }
+
     /**
      * 工作组创建会议通知
      *
@@ -228,6 +257,18 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
         //编辑标协会议
         if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
             stableCrossTrainingService.edit(payMeeting, hotelContactsList);
+            List<String> fileIdList = new ArrayList<>();
+            String meetingFiles = payMeeting.getMeetingFiles();
+            if (StrUtil.isNotBlank(meetingFiles)){
+                List<String> strings = Arrays.asList(meetingFiles.split(","));
+                List<String> arrayList = new ArrayList<>(strings);
+                fileIdList.addAll(arrayList);
+            }
+            String paymentQrCode = payMeeting.getPaymentQrCode();
+            if (StrUtil.isNotBlank(paymentQrCode)){
+                fileIdList.add(paymentQrCode);
+            }
+            pushStandardsFiles(fileIdList);
         }
     }
 
@@ -590,14 +631,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
         }
         //如果是标协会议就同步文件
         if (meetingCommon.equals(MeetingCommon.STANDARD_MEETING_INT)) {
-            List<OSSFile> ossFiles = iossFileService.listByIds(meetingFileIdList);
-            for (OSSFile ossFile : ossFiles) {
-                String url = ossFile.getUrl();
-                String[] fileUrl = url.split("/");
-                int length = fileUrl.length;
-                ossFile.setFileName(fileUrl[length - 1]);
-            }
-            AuthenticationUtils.post("/stablecrosstraining/stableCrossTraining/addStandardsFile", null, ossFiles);
+            pushStandardsFiles(meetingFileIdList);
             StableCrossTraining stableCrossTraining = new StableCrossTraining();
             stableCrossTraining.setId(id);
             stableCrossTraining.setMeetingFiles(fileIds);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java
index 7bb6f0b3..881f8dad 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java
@@ -77,26 +77,14 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl<StableCrossTrain
         stableCrossTraining.setConvokeEndTime(endTime);
         stableCrossTraining.setConvokeLocale(payMeeting.getConvokeLocale());
         stableCrossTraining.setPlaceName(payMeeting.getVenue());
-        List<String> fileIdList = new ArrayList<>();
         String meetingData = payMeeting.getMeetingData();
         stableCrossTraining.setMeetingFiles(meetingData);
-        if (StrUtil.isNotBlank(meetingData)){
-            List<String> strings = Arrays.asList(meetingData.split(","));
-            List<String> arrayList = new ArrayList<>(strings);
-            fileIdList.addAll(arrayList);
-        }
+
         String meetingFiles = payMeeting.getMeetingFiles();
         stableCrossTraining.setMeetingNotifyFiles(meetingFiles);
-        if (StrUtil.isNotBlank(meetingFiles)){
-            List<String> strings = Arrays.asList(meetingFiles.split(","));
-            List<String> arrayList = new ArrayList<>(strings);
-            fileIdList.addAll(arrayList);
-        }
+
         String paymentQrCode = payMeeting.getPaymentQrCode();
         stableCrossTraining.setPaymentQrCode(paymentQrCode);
-        if (StrUtil.isNotBlank(paymentQrCode)){
-            fileIdList.add(paymentQrCode);
-        }
 
         stableCrossTraining.setAddress(payMeeting.getAddress());
         stableCrossTraining.setEstimatedNumber(payMeeting.getEstimatedNumber());
@@ -125,16 +113,6 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl<StableCrossTrain
             hotelList.add(hotelContact);
         }
         stableCrossTraining.setHotelList(hotelList);
-        if (!fileIdList.isEmpty()) {
-            List<OSSFile> ossFiles = iossFileService.listByIds(fileIdList);
-            for (OSSFile ossFile : ossFiles) {
-                String url = ossFile.getUrl();
-                String[] fileUrl = url.split("/");
-                int length = fileUrl.length;
-                ossFile.setFileName(fileUrl[length - 1]);
-            }
-            AuthenticationUtils.post("/stablecrosstraining/stableCrossTraining/addStandardsFile",null,ossFiles);
-        }
         return stableCrossTraining;
     }