From 278a446e5772bcfb019ae100e11ca8d1efa602dc Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 21 Oct 2021 16:54:00 +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=20=E9=9D=9E=E6=89=93=E5=8C=85=E6=83=85=E5=86=B5=20?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=8F=91=E7=A5=A8=E6=97=B6=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E9=82=AE=E5=AF=84=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8D=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayMeetingSituationServiceImpl.java  | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 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 60a058b1..4878ba95 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
@@ -882,7 +882,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                 //缴费方式为汇款或线上缴费
             } else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1)
                     || Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)) {
-                ValidUtil.validate(commonPeopleVO, NotPack.class);
+                Integer needInvoice = commonPeopleVO.getNeedInvoice();
+                //需要发票时校验邮寄
+                if (!needInvoice.equals(ProjectCommon.NEED_INVOICE0)){
+                    ValidUtil.validate(commonPeopleVO, NotPack.class);
+                }
                 String paymentRecord = payMeetingSituation.getPaymentRecord();
                 String orderCode = payMeetingSituation.getOrderCode();
                 //优先判断合同 判断是否为合同添加的参会人
@@ -929,18 +933,21 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                     payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCosts());
                 }
                 ValidUtil.validate(commonPeopleVO);
-                //校验邮寄联系人
-                String postContactId = commonPeopleVO.getPostContactId();
-                PayContactsManagement postContact = contactsManagementService.getById(postContactId);
-                //校验是否是选择的企业的联系人
-                String companyId2 = postContact.getCompanyId();
-                if (companyId2.equals(companyId)) {
-                    payMeetingSituation1.setPostContactId(postContact.getId());
-                    payMeetingSituation1.setPostContactName(postContact.getName());
-                    payMeetingSituation1.setPostContactAddress(payMeetingSituation.getPostContactAddress());
-                    payMeetingSituation1.setPostCode(payMeetingSituation.getPostCode());
-                } else {
-                    throw new JeroBootException("邮寄联系人不是所选企业的企业联系人");
+                //需要发票时校验邮寄
+                if (!needInvoice.equals(ProjectCommon.NEED_INVOICE0)){
+                    //校验邮寄联系人
+                    String postContactId = commonPeopleVO.getPostContactId();
+                    PayContactsManagement postContact = contactsManagementService.getById(postContactId);
+                    //校验是否是选择的企业的联系人
+                    String companyId2 = postContact.getCompanyId();
+                    if (companyId2.equals(companyId)) {
+                        payMeetingSituation1.setPostContactId(postContact.getId());
+                        payMeetingSituation1.setPostContactName(postContact.getName());
+                        payMeetingSituation1.setPostContactAddress(payMeetingSituation.getPostContactAddress());
+                        payMeetingSituation1.setPostCode(payMeetingSituation.getPostCode());
+                    } else {
+                        throw new JeroBootException("邮寄联系人不是所选企业的企业联系人");
+                    }
                 }
                 payMeetingSituation1.setCheckInHotel(payMeetingSituation.getCheckInHotel());
                 payMeetingSituation1.setArrivalTime(payMeetingSituation.getArrivalTime());