From 33784ef5bfcbf183ccebfebf17d311b038aa3a0f Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 10 Sep 2021 18:48:59 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=B7=BB=E5=8A=A0=E5=8F=82=E4=BC=9A?=
 =?UTF-8?q?=E4=BA=BA=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/meeting/entity/PayMeetingSituation.java | 3 +--
 .../service/impl/PayMeetingSituationServiceImpl.java      | 8 +++++---
 .../java/com/jero/meeting/vo/InternationalGuestVO.java    | 7 +++----
 .../java/com/jero/meeting/vo/PayMeetingSituationVO.java   | 3 +--
 4 files changed, 10 insertions(+), 11 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 02506609..3c64aaf2 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
@@ -126,14 +126,13 @@ public class PayMeetingSituation implements Serializable {
 	/**演讲题目*/
 	@Excel(name = "演讲题目", width = 15)
     @ApiModelProperty(value = "演讲题目")
-    @NotBlank(message = "演讲题目不能为空",groups = Guest.class)
     @Size(max = 50, message = "演讲题目最大为50字符")
     private String speechTopic;
 
 	/**演讲ppt*/
 	@Excel(name = "演讲ppt", width = 15)
     @ApiModelProperty(value = "演讲ppt")
-    @NotBlank(message = "演讲ppt不能为空",groups = Guest.class)
+    //@NotBlank(message = "演讲ppt不能为空",groups = Guest.class)
     private String speechPpt;
 
 	/**照片*/
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 94e1405d..51d550b9 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
@@ -182,7 +182,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 		PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId);
 		//处理联系人
 		canHuiContact(payMeetingSituation1, companyId, contactsManagement);
-
+		//存入打包字段
+		payMeetingSituation1.setPack(PayProjectCommon.PACKAGING0);
+		payMeetingSituation1.setNeedInvoice(PayProjectCommon.NO);
 		//判断身份
 		Integer identity = payMeetingSituation.getIdentity();
 		//国际研讨会会议的嘉宾和其他类型不同
@@ -227,6 +229,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 					}
 				}
 			}
+			BeanUtils.copyProperties(internationalGuestVO, payMeetingSituation1);
 		//参会人
 		} else if (identity.equals(MeetingSubitemCommon.CAN_HUI_REN)) {
 			CommonPeopleVO commonPeopleVO = new CommonPeopleVO();
@@ -240,8 +243,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 				payMeetingSituation1.setPack(PayProjectCommon.PACKAGING1);
 				payMeetingSituation1.setAmountReceivable(new BigDecimal(0));
 			} else {
-				//存入打包字段
-				payMeetingSituation1.setPack(PayProjectCommon.PACKAGING0);
+
 				payMeetingSituation1.setNeedInvoice(payMeetingSituation.getNeedInvoice());
 				payMeetingSituation1.setPaymentRecord(payMeetingSituation.getPaymentRecord());
 				//如果是标协会议判断会员类型
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 8f3928c0..e91be654 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
@@ -25,14 +25,13 @@ public class InternationalGuestVO {
     /**演讲题目*/
     @Excel(name = "演讲题目", width = 15)
     @ApiModelProperty(value = "演讲题目")
-    @NotBlank(message = "演讲题目不能为空",groups = Guest.class)
     @Size(max = 50, message = "演讲题目最大为50字符",groups = Guest.class)
     private String speechTopic;
 
     /**演讲ppt*/
     @Excel(name = "演讲ppt", width = 15)
     @ApiModelProperty(value = "演讲ppt")
-    @NotBlank(message = "演讲ppt不能为空",groups = Guest.class)
+    //@NotBlank(message = "演讲ppt不能为空",groups = Guest.class)
     private String speechPpt;
 
     /**照片*/
@@ -57,7 +56,7 @@ public class InternationalGuestVO {
     /**是否回民*/
     @Excel(name = "是否回民", width = 15)
     @ApiModelProperty(value = "是否回民")
-    @NotBlank(message = "是否回民不能为空",groups = HaveMeals.class)
+    @NotNull(message = "是否回民不能为空",groups = HaveMeals.class)
     @Min(value = 0,groups = HaveMeals.class)
     @Max(value = 1,groups = HaveMeals.class)
     private Integer huiPeople;
@@ -65,7 +64,7 @@ public class InternationalGuestVO {
     /**是否入住协议酒店*/
     @Excel(name = "是否入住协议酒店", width = 15)
     @ApiModelProperty(value = "是否入住协议酒店")
-    @NotBlank(message = "是否入住协议酒店不能为空",groups = VIP.class)
+    @NotNull(message = "是否入住协议酒店不能为空",groups = VIP.class)
     @Min(0)
     @Max(1)
     private Integer checkInHotel;
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 9035b52e..2282693a 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
@@ -113,14 +113,13 @@ public class PayMeetingSituationVO {
     /**演讲题目*/
     @Excel(name = "演讲题目", width = 15)
     @ApiModelProperty(value = "演讲题目")
-    @NotBlank(message = "演讲题目不能为空",groups = Guest.class)
     @Size(max = 50, message = "演讲题目最大为50字符")
     private String speechTopic;
 
     /**演讲ppt*/
     @Excel(name = "演讲ppt", width = 15)
     @ApiModelProperty(value = "演讲ppt")
-    @NotBlank(message = "演讲ppt不能为空",groups = Guest.class)
+    //@NotBlank(message = "演讲ppt不能为空",groups = Guest.class)
     private String speechPpt;
 
     /**照片*/