update Wasic国际研讨会

判断是否有两个小会议区分金额
2023-11-02 16:06:05 +08:00
parent 9d00959942
commit d976aead97
1 changed files with 6 additions and 7 deletions
@@ -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();
                }