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 2f9bcae6..aa1a7404 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 @@ -1159,13 +1159,46 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl linkTopicList = Arrays.asList(linkTopics.split(",")); + //先判断是否有免费专题 + String choiceTopic = payMeetingSituation.getChoiceTopic(); + payMeetingSituation1.setChoiceTopic(choiceTopic); + List choiceTopicList = Arrays.asList(choiceTopic.split(",")); + if (!linkTopicList.containsAll(choiceTopicList)) { + throw new JeroBootException("课题名称选择错误"); + } + boolean isFree = false; + for (String s : choiceTopicList) { + if ("6".equals(s)){ + isFree = true; + break; + } + } + //根据选择的课题数量,存入金额 + if (isFree){ + amountReceivable = BigDecimal.ZERO; + }else { + if (choiceTopicList.size() <= 2){ + amountReceivable = payMeeting.getMeetingCostsTwoTopic(); + }else { + amountReceivable = payMeeting.getMeetingCostsThreeTopic(); + } + } + }else { + amountReceivable = payMeeting.getMeetingCosts(); + } + } else { + amountReceivable = payMeeting.getMeetingCosts(); } + isZero = amountReceivable.compareTo(new BigDecimal("0.00")) == 0; + payMeetingSituation1.setAmountReceivable(amountReceivable); CommonPeopleVO commonPeopleVO = new CommonPeopleVO(); BeanUtils.copyProperties(payMeetingSituation, commonPeopleVO); @@ -1245,48 +1278,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl linkTopicList = Arrays.asList(linkTopics.split(",")); - //先判断是否有免费专题 - String choiceTopic = payMeetingSituation.getChoiceTopic(); - payMeetingSituation1.setChoiceTopic(choiceTopic); - List choiceTopicList = Arrays.asList(choiceTopic.split(",")); - if (!linkTopicList.containsAll(choiceTopicList)) { - throw new JeroBootException("课题名称选择错误"); - } - boolean isFree = false; - for (String s : choiceTopicList) { - if ("6".equals(s)){ - payMeetingSituation1.setAmountReceivable(BigDecimal.ZERO); - isFree = true; - } - } - //根据选择的课题数量,存入金额 - if (!isFree && choiceTopicList.size() <= 2){ - payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCostsTwoTopic()); - } - if (!isFree && choiceTopicList.size() > 2){ - payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCostsThreeTopic()); - } - }else { - payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCosts()); - } - } else { - payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCosts()); - } if (!isZero){ ValidUtil.validate(commonPeopleVO); } @@ -1311,7 +1303,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl