From c1817ab617284a5382f2e1f9d2511fda45198cc7 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 23 Oct 2023 17:32:36 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=9B=BD=E9=99=85=E7=A0=94=E8=AE=A8?=
 =?UTF-8?q?=E4=BC=9A=E5=A4=84=E7=90=86=E5=8F=82=E4=BC=9A=E4=BA=BA=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/InternalMeetingController.java | 10 ++++++++++
 .../meeting/service/IPayMeetingService.java   |  2 ++
 .../service/impl/PayMeetingServiceImpl.java   |  7 +++++++
 .../impl/PayMeetingSituationServiceImpl.java  | 19 ++++++++-----------
 .../com/jero/meeting/vo/PayMeetingVO.java     |  1 +
 5 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java
index 7195a689..4ba00d9a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java
@@ -228,4 +228,14 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
         payMeetingService.release(publishReminderVO);
         return Result.OK();
     }
+
+    /**
+     * 发布
+     */
+    @ApiOperation(value = "发布")
+    @GetMapping(value = "/getLinkTopics")
+    public Result<?> getLinkTopics(@RequestParam(name = "id") String id) {
+        payMeetingService.getLinkTopics(id);
+        return Result.OK();
+    }
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java
index b75fb1aa..155aaa85 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java
@@ -104,4 +104,6 @@ public interface IPayMeetingService extends IService<PayMeeting> {
     void release(PublishReminderVO publishReminderVO);
 
     void standardsRelease(PublishReminderVO publishReminderVO);
+
+    void getLinkTopics(String id);
 }
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 03228b41..bb510d6a 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
@@ -1505,4 +1505,11 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
         wrapper.set(PayMeeting::getIsRelease,MeetingCommon.REMIND_1);
         update(wrapper);
     }
+
+    @Override
+    public void getLinkTopics(String id) {
+        PayMeeting payMeeting = getById(id);
+        String linkTopics = payMeeting.getLinkTopics();
+        //sysBaseAPI.dict
+    }
 }
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 aa1a7404..ef0452b4 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
@@ -1170,27 +1170,24 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                     //先判断是否有免费专题
                     String choiceTopic = payMeetingSituation.getChoiceTopic();
                     payMeetingSituation1.setChoiceTopic(choiceTopic);
-                    List<String> choiceTopicList = Arrays.asList(choiceTopic.split(","));
+                    List<String> choiceTopicList = Arrays.stream(choiceTopic.split(",")).distinct().collect(Collectors.toList());
                     if (!linkTopicList.containsAll(choiceTopicList)) {
                         throw new JeroBootException("课题名称选择错误");
                     }
-                    boolean isFree = false;
-                    for (String s : choiceTopicList) {
+                    for (int i = 0; i < choiceTopicList.size(); i++) {
+                        String s = choiceTopicList.get(i);
                         if ("6".equals(s)){
-                            isFree = true;
+                            choiceTopicList.remove(i);
                             break;
                         }
                     }
                     //根据选择的课题数量，存入金额
-                    if (isFree){
-                        amountReceivable = BigDecimal.ZERO;
+                    if (choiceTopicList.size() <= 2){
+                        amountReceivable = payMeeting.getMeetingCostsTwoTopic();
                     }else {
-                        if (choiceTopicList.size() <= 2){
-                            amountReceivable = payMeeting.getMeetingCostsTwoTopic();
-                        }else {
-                            amountReceivable = payMeeting.getMeetingCostsThreeTopic();
-                        }
+                        amountReceivable = payMeeting.getMeetingCostsThreeTopic();
                     }
+
                 }else {
                     amountReceivable = payMeeting.getMeetingCosts();
                 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
index 223c8659..a341dfb6 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
@@ -206,6 +206,7 @@ public class PayMeetingVO implements Serializable {
 
     /**是否WASIC*/
     @Excel(name = "是否WASIC", width = 15, dicCode = "yn")
+    @Dict(dicCode = "yn")
     @ApiModelProperty(value = "是否WASIC")
     @NotNull(message = "是否WASIC不能为空",groups = InternationalMeeting.class)
     @Range(min = 1, max = 2,message = "是否WASIC格式不正确",groups = InternationalMeeting.class)