add 国际研讨会参会人新增字段

jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java

@@ -125,6 +125,12 @@ public class PayMeetingSituation implements Serializable {
     @Max(value = 4,groups = Guest.class)
     private Integer guestType;
 
+    /**演讲题目*/
+    @Excel(name = "课题名称", width = 15)
+    @ApiModelProperty(value = "课题名称")
+    @Size(max = 50, message = "课题名称")
+    private String choiceTopic;
+
 	/**演讲题目*/
 	@Excel(name = "演讲题目", width = 15)
     @ApiModelProperty(value = "演讲题目")

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java

@@ -433,7 +433,13 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
             payMeetingVO.setDirectorPhone(loginUser.getPhone());
         }
         //如果会议费用为0则不可上传收款二维码
-        if (payMeetingVO.getMeetingCosts().compareTo(BigDecimal.ZERO) < 1) {
+        BigDecimal meetingCosts = payMeetingVO.getMeetingCosts();
+        if (!meetingType.equals(MeetingCommon.INTERNATIONAL_MEETING)){
+            if (meetingCosts == null) {
+                throw new JeroBootException("会议费用不能为空");
+            }
+        }
+        if (meetingCosts == null && meetingCosts.compareTo(BigDecimal.ZERO) < 1) {
             if (StringUtils.isNotBlank(payMeetingVO.getPaymentQrCode())) {
                 throw new JeroBootException("会议费用为0时，不可上传收款二维码");
             }

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java

@@ -1254,6 +1254,31 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                 } else {
                     payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCosts());
                 }
+            } else if (meetingType.equals(MeetingCommon.INTERNATIONAL_MEETING_INT)){
+
+                Integer isWasic = payMeeting.getIsWasic();
+                if (PayProjectCommon.YES.equals(isWasic)){
+                    //先判断是否有免费专题
+                    String choiceTopic = payMeetingSituation.getChoiceTopic();
+                    payMeetingSituation1.setChoiceTopic(choiceTopic);
+                    String[] split = choiceTopic.split(",");
+                    boolean isFree = false;
+                    for (String s : split) {
+                        if ("6".equals(s)){
+                            payMeetingSituation1.setAmountReceivable(BigDecimal.ZERO);
+                            isFree = true;
+                        }
+                    }
+                    //根据选择的课题数量，存入金额
+                    if (!isFree && split.length <= 2){
+                        payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCostsTwoTopic());
+                    }
+                    if (!isFree && split.length > 2){
+                        payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCostsThreeTopic());
+                    }
+                }else {
+                    payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCosts());
+                }
             } else {
                 payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCosts());
             }

jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java

@@ -214,7 +214,6 @@ public class PayMeetingVO implements Serializable {
 	/**会议费用*/
 	@Excel(name = "会议费用", width = 15)
     @ApiModelProperty(value = "会议费用")
-    @NotNull(message = "会议费用不能为空")
     @DecimalMax(value = "9999999999.99",message = "会议费用格式错误")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal meetingCosts;