From 9eebd35bcd2afa0f0e90396614e5678f86e019de Mon Sep 17 00:00:00 2001 From: lijiarao <136157943@qq.com> Date: Sun, 5 Nov 2023 15:10:29 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=A1=E9=AA=8C=E5=98=89=E5=AE=BE?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayMeetingSituationServiceImpl.java | 128 +++++++----------- 1 file changed, 50 insertions(+), 78 deletions(-) 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 d3d44e3d..cb33b73a 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 @@ -1,5 +1,4 @@ package com.jero.meeting.service.impl; -import java.io.File; import java.util.Date; import cn.hutool.core.date.DateField; @@ -27,7 +26,6 @@ import com.jero.common.service.ContractCreateProjectSendMessageService; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.AuthenticationUtils; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; import com.jero.common.util.oConvertUtils; @@ -75,13 +73,11 @@ import com.jero.project.entity.PayWorkingGroupSubItemContacts; import com.jero.project.service.IPayWorkingGroupSubItemContactsService; import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.standards.memberinfo.service.IMemberInfoService; -import com.jero.standards.xuanguan.stablecrosstraining.entity.StableCrossTraining; import com.jero.temporary.service.IPayCompanyManagementTemporaryService; import com.jero.temporary.service.IPayContactsManagementTemporaryService; import com.jero.util.ObjRecordUtil; import com.jero.util.module.ObjRecordUtilModule; import org.apache.commons.lang3.StringUtils; -import org.apache.logging.log4j.util.Strings; import org.apache.shiro.SecurityUtils; import org.jetbrains.annotations.NotNull; import org.springframework.beans.BeanUtils; @@ -525,7 +521,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl validateReturnList = ValidUtil.validateReturnList(internationalGuestVO); - //接站 - 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)); - //用餐 - Integer haveMeals = internationalGuestVO.getHaveMeals(); - if (haveMeals.equals(MeetingSubitemCommon.HAVE_MEALS)) { - validateReturnList.addAll(ValidUtil.validateReturnList(internationalGuestVO, HaveMeals.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,"，")); - } - } + //校验嘉宾 + verificationGuests(internationalGuestVO); BeanUtils.copyProperties(internationalGuestVO, payMeetingSituation1); setZero(payMeetingSituation1); // 参会人 @@ -1410,6 +1373,49 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl validateReturnList = ValidUtil.validateReturnList(internationalGuestVO); + //接站 + 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)); + //用餐 + Integer haveMeals = internationalGuestVO.getHaveMeals(); + if (haveMeals.equals(MeetingSubitemCommon.HAVE_MEALS)) { + validateReturnList.addAll(ValidUtil.validateReturnList(internationalGuestVO, HaveMeals.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,"，")); + } + } + } + private void setZero(PayMeetingSituation payMeetingSituation1) { payMeetingSituation1.setAmountReceivable(BigDecimal.ZERO); @@ -1789,42 +1795,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl 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, "，")); - } - } + //校验嘉宾 + verificationGuests(internationalGuestVO); PayMeetingSituation update = new PayMeetingSituation(); update.setId(id); BeanUtils.copyProperties(internationalGuestVO, update);