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 069a5dad..0e4c3170 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,16 +1217,15 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl "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(); }