diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java index e4665c09..18e562f3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java @@ -348,4 +348,15 @@ public class PayMeetingSituationController extends JeroController editGuestInfo(@RequestBody PayMeetingSituation payMeetingSituation) { + payMeetingSituationService.editGuestInfo(payMeetingSituation); + return Result.OK("修改成功"); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java index 2ac6223b..ac3441e4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java @@ -88,4 +88,6 @@ public interface IPayMeetingSituationService extends IService validateReturnList = ValidUtil.validateReturnList(internationalGuestVO); + //用餐 + Integer haveMeals = internationalGuestVO.getHaveMeals(); + if (haveMeals.equals(MeetingSubitemCommon.HAVE_MEALS)) { + validateReturnList.addAll(ValidUtil.validateReturnList(internationalGuestVO, HaveMeals.class)); + } + //接站 + Integer pickUp = internationalGuestVO.getPickUp(); + if (pickUp.equals(MeetingSubitemCommon.PICK_UP)) { + validateReturnList.addAll(ValidUtil.validateReturnList(internationalGuestVO, PickUp.class)); + } + //送站 + Integer deliveryStation = internationalGuestVO.getDeliveryStation(); + if (deliveryStation.equals(MeetingSubitemCommon.DELIVERY_STATION)) { + validateReturnList.addAll(ValidUtil.validateReturnList(internationalGuestVO, DeliveryStation.class)); + } + //校验VIP,演讲嘉宾的公共字段 + if (!guestType.equals(MeetingSubitemCommon.GUEST)) { + validateReturnList.addAll(ValidUtil.validateReturnList(internationalGuestVO, Guest.class)); + //校验VIP + if (guestType.equals(MeetingSubitemCommon.VIP)) { + validateReturnList.addAll(ValidUtil.validateReturnList(internationalGuestVO, VIP.class)); + Integer checkInHotel = internationalGuestVO.getCheckInHotel(); + if (checkInHotel.equals(MeetingSubitemCommon.CHECK_IN_HOTEL)) { + validateReturnList.addAll(ValidUtil.validateReturnList(internationalGuestVO, CheckInHotel.class)); + } + } + } + if (!validateReturnList.isEmpty()) { + throw new JeroBootException(StringUtils.join(validateReturnList, ",")); + } + } + PayMeetingSituation update = new PayMeetingSituation(); + update.setId(id); + BeanUtils.copyProperties(internationalGuestVO, update); + updateById(update); + } }