update 编辑参会人逻辑修改

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

@@ -282,8 +282,6 @@ public class PayMeetingSituation implements Serializable {
 	@Excel(name = "缴费方式", width = 15,dicCode = "meeting_pay_type")
     @ApiModelProperty(value = "缴费方式")
     @NotNull(message = "缴费方式不能为空",groups = CommonPeople.class)
-    @Min(1)
-    @Max(3)
     @Dict(dicCode = "meeting_pay_type")
     private Integer payMode;
 

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

@@ -978,23 +978,21 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         //判断是否审核通过
         Integer checkResult = oldObject.getCheckResult();
         Integer registerCheckResult = oldObject.getRegisterCheckResult();
-
-        if (Objects.equals(checkResult, MeetingSubitemCommon.SIGNUP_STATUS_1) && Objects.equals(registerCheckResult, MeetingSubitemCommon.SIGNUP_STATUS_1)) {
-            /*ObjRecordUtilModule objRecordUtilModule = ObjRecordUtil.addRecord(oldObject, payMeetingSituation1);
-            List<String> fieldNames = objRecordUtilModule.getFieldNames();
-            List<String> canModifyList = Arrays.asList(CAN_MODIFY_LIST);
-            boolean containsAll = canModifyList.containsAll(fieldNames);
-            if (!containsAll) {
-                throw new JeroBootException("审核通过之后只允许修改行程信息");
-            }*/
-            payMeetingSituation1 = new PayMeetingSituation();
-            payMeetingSituation1.setId(payMeetingSituationVO.getId());
-            payMeetingSituation1.setArrivalTime(payMeetingSituationVO.getArrivalTime());
-            payMeetingSituation1.setDepartureTime(payMeetingSituationVO.getDepartureTime());
-            payMeetingSituation1.setCheckInHotel(payMeetingSituationVO.getCheckInHotel());
-        }else {
-            payMeetingSituation1 = getPayMeetingSituation(payMeetingSituation);
+        Integer identity = oldObject.getIdentity();
+        //如果是参会人判断
+        if (identity.equals(MeetingSubitemCommon.CAN_HUI_REN)) {
+            Integer identity1 = payMeetingSituationVO.getIdentity();
+            if (!Objects.equals(identity,identity1)) {
+                //确认收入或开票
+                if (oldObject.getConfirmAmount() != null && BigDecimal.ZERO.equals(oldObject.getConfirmAmount())){
+                    throw new JeroBootException("已经确认收入，身份不可变更");
+                }
+                if (oldObject.getInvoiceAmount() != null && !BigDecimal.ZERO.equals(oldObject.getInvoiceAmount())) {
+                    throw new JeroBootException("已经开票，身份不可变更");
+                }
+            }
         }
+        payMeetingSituation1 = getPayMeetingSituation(payMeetingSituation);
         //如果是对接人修改的
         if (sysUserId.equals(dockId)) {
             PayMeetingSituation newObject = new PayMeetingSituation();
@@ -1131,6 +1129,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                 }
             }
             BeanUtils.copyProperties(internationalGuestVO, payMeetingSituation1);
+            setZero(payMeetingSituation1);
             //    参会人
         } else if (identity.equals(MeetingSubitemCommon.CAN_HUI_REN)) {
             boolean checkMember = false;
@@ -1240,6 +1239,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             BeanUtils.copyProperties(payMeetingSituation, commonGuestVO);
             ValidUtil.validate(commonGuestVO);
             BeanUtils.copyProperties(commonGuestVO, payMeetingSituation1);
+            setZero(payMeetingSituation1);
         }
         payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
         //如果是工作组会议或者分标委会议或理事会会议，判断是否为成员
@@ -1288,6 +1288,16 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         return payMeetingSituation1;
     }
 
+    private void setZero(PayMeetingSituation payMeetingSituation1) {
+        payMeetingSituation1.setAmountReceivable(BigDecimal.ZERO);
+
+        payMeetingSituation1.setPaidAmount(BigDecimal.ZERO);
+        payMeetingSituation1.setPaidTax(BigDecimal.ZERO);
+        payMeetingSituation1.setPaidNoTaxAmount(BigDecimal.ZERO);
+
+        payMeetingSituation1.setPayMode(0);
+    }
+
     /**
      * 判断是否是会员单位
      * @param companyName 公司名称

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

@@ -41,8 +41,6 @@ public class CommonPeopleVO{
     @Excel(name = "缴费方式", width = 15)
     @ApiModelProperty(value = "缴费方式")
     @NotNull(message = "缴费方式不能为空")
-    @Min(1)
-    @Max(3)
     private Integer payMode;
 
     /**需要发票*/

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

@@ -237,8 +237,6 @@ public class MeetingSituationContractVO {
     /**缴费方式*/
     @ApiModelProperty(value = "缴费方式")
     @NotNull(message = "缴费方式不能为空",groups = CommonPeople.class)
-    @Min(1)
-    @Max(3)
     @Dict(dicCode = "meeting_pay_type")
     private Integer payMode;
 

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

@@ -260,8 +260,6 @@ public class PayMeetingSituationVO {
     @Excel(name = "缴费方式", width = 15)
     @ApiModelProperty(value = "缴费方式")
     @NotNull(message = "缴费方式不能为空",groups = CommonPeople.class)
-    @Min(1)
-    @Max(3)
     @Dict(dicCode = "meeting_pay_type")
     private Integer payMode;