update 国际研讨会处理参会人金额

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();
+    }
 }

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);
 }

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
+    }
 }

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();
                 }

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)