From d6a43ad52d0166f4b9aba9f78169c725b700c080 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 3 Nov 2023 17:17:48 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=9B=BD=E9=99=85=E7=A0=94=E8=AE=A8?=
 =?UTF-8?q?=E4=BC=9A=E6=96=B0=E5=A2=9E=E7=9B=AE=E7=9A=84=E5=9C=B0=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=90=8C=E8=A1=8C=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/meeting/entity/PayMeetingSituation.java   |  9 ++++-----
 .../service/impl/PayMeetingSituationServiceImpl.java   | 10 +++++-----
 .../java/com/jero/meeting/vo/InternationalGuestVO.java | 10 ++++------
 .../jero/meeting/vo/MeetingSituationContractVO.java    |  8 ++++----
 .../com/jero/meeting/vo/PayMeetingSituationVO.java     |  9 ++++-----
 .../meeting/vo/excel/InternationalSituationExcel.java  |  7 +++----
 6 files changed, 24 insertions(+), 29 deletions(-)

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 f79a9cba..25e55169 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
@@ -212,6 +212,10 @@ public class PayMeetingSituation implements Serializable {
     @ApiModelProperty(value = "到达班次")
     private String arrivalShift;
 
+    @Excel(name = "目的地", width = 15)
+    @ApiModelProperty(value = "目的地")
+    private String destinationHotel;
+
 	/**是否需要送站*/
 	@Excel(name = "是否需要送站", width = 15,dicCode = "yn")
     @ApiModelProperty(value = "是否需要送站")
@@ -235,11 +239,6 @@ public class PayMeetingSituation implements Serializable {
     @ApiModelProperty(value = "离开班次")
     private String departureShift;
 
-	/**同行人*/
-	@Excel(name = "同行人", width = 15)
-    @ApiModelProperty(value = "同行人")
-    private String peer;
-
 	/**备注*/
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
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 0e4c3170..d3d44e3d 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
@@ -1159,11 +1159,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             if (!guestType.equals(MeetingSubitemCommon.COOPERATIVE) && !guestType.equals(MeetingSubitemCommon.EXHIBITOR)) {
                 //先校验VIP，演讲嘉宾，特邀嘉宾的公共字段
                 List<String> 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)) {
@@ -1177,6 +1172,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                 //校验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));
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/InternationalGuestVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/InternationalGuestVO.java
index 6e2aedcb..48b32970 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/InternationalGuestVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/InternationalGuestVO.java
@@ -120,6 +120,10 @@ public class InternationalGuestVO {
     @NotNull(message = "到达班次不能为空",groups = PickUp.class)
     private String arrivalShift;
 
+    @Excel(name = "目的地", width = 15)
+    @ApiModelProperty(value = "目的地")
+    private String destinationHotel;
+
     /**是否需要送站*/
     @Excel(name = "是否需要送站", width = 15)
     @ApiModelProperty(value = "是否需要送站")
@@ -150,11 +154,5 @@ public class InternationalGuestVO {
     @NotBlank(message = "离开班次不能为空",groups = DeliveryStation.class)
     private String departureShift;
 
-    /**同行人*/
-    @Excel(name = "同行人", width = 15)
-    @ApiModelProperty(value = "同行人")
-    @Size(max = 50,message = "同行人最大为50字符")
-    private String peer;
-
 
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingSituationContractVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingSituationContractVO.java
index bc537be1..5e52455b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingSituationContractVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/MeetingSituationContractVO.java
@@ -183,6 +183,10 @@ public class MeetingSituationContractVO {
     @ApiModelProperty(value = "到达班次")
     private String arrivalShift;
 
+    @Excel(name = "目的地", width = 15)
+    @ApiModelProperty(value = "目的地")
+    private String destinationHotel;
+
     /**是否需要送站*/
     @ApiModelProperty(value = "是否需要送站")
     @Dict(dicCode = "yn")
@@ -202,10 +206,6 @@ public class MeetingSituationContractVO {
     @ApiModelProperty(value = "离开班次")
     private String departureShift;
 
-    /**同行人*/
-    @ApiModelProperty(value = "同行人")
-    private String peer;
-
     /**备注*/
     @ApiModelProperty(value = "备注")
     private String remark;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingSituationVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingSituationVO.java
index 80889636..6d344b5e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingSituationVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingSituationVO.java
@@ -200,6 +200,10 @@ public class PayMeetingSituationVO {
     @ApiModelProperty(value = "到达班次")
     private String arrivalShift;
 
+    @Excel(name = "目的地", width = 15)
+    @ApiModelProperty(value = "目的地")
+    private String destinationHotel;
+
     /**是否需要送站*/
     @Excel(name = "是否需要送站", width = 15)
     @ApiModelProperty(value = "是否需要送站")
@@ -223,11 +227,6 @@ public class PayMeetingSituationVO {
     @ApiModelProperty(value = "离开班次")
     private String departureShift;
 
-    /**同行人*/
-    @Excel(name = "同行人", width = 15)
-    @ApiModelProperty(value = "同行人")
-    private String peer;
-
     /**备注*/
     @Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalSituationExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalSituationExcel.java
index 92048454..595f23b5 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalSituationExcel.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalSituationExcel.java
@@ -99,6 +99,9 @@ public class InternationalSituationExcel extends SituationBaseExcel {
     @Excel(name = "到达班次", width = 15)
     private String arrivalShift;
 
+    @Excel(name = "目的地", width = 15)
+    private String destinationHotel;
+
     /**是否需要送站*/
     @Excel(name = "是否需要送站", width = 15,dicCode = "yn")
     private Integer deliveryStation;
@@ -115,10 +118,6 @@ public class InternationalSituationExcel extends SituationBaseExcel {
     @Excel(name = "离开班次", width = 15)
     private String departureShift;
 
-    /**同行人*/
-    @Excel(name = "同行人", width = 15)
-    private String peer;
-
     /**邮寄联系人*/
     @Excel(name = "邮寄联系人", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id")
     private String postContactId;