diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java index af13b989..444bbed9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java +++ b/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; 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 a57561d9..ba2c037a 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 @@ -978,23 +978,21 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl fieldNames = objRecordUtilModule.getFieldNames(); - List 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