From f20f4bd0b7bd35c809fa1da008c0572b28459adb Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 24 Sep 2021 16:53:35 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=BC=B4=E8=B4=B9=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=BA=E7=BA=BF=E4=B8=8A=E7=BC=B4=E8=B4=B9=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E4=B8=BA=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E6=9C=9F=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/common/MeetingSubitemCommon.java  |  5 ++++
 .../impl/PayMeetingSituationServiceImpl.java  | 28 ++++++++++++++++---
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java
index 4863f3df..c4e5caf4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java
@@ -18,6 +18,11 @@ public class MeetingSubitemCommon {
      */
     public final static Integer NEI_BU_QI_YE = 3;
 
+    /**
+     * 缴费方式:线上缴费
+     */
+    public final static Integer PAY_MODE_2 = 2;
+
     /**
      * 缴费方式:打包
      */
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 3743a198..103bf8e9 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
@@ -7,10 +7,16 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.common.ProjectCommon;
+import com.jero.common.dto.SendMessageDTO;
+import com.jero.common.enums.CompanyMessageEnums;
+import com.jero.common.enums.ManagementMessageEnums;
+import com.jero.common.common.ProjectCommon;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.service.SendMessageService;
 import com.jero.common.service.ContractCreateProjectSendMessageService;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.vo.LoginUser;
+import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.ValidUtil;
 import com.jero.company.entity.PayCompanyManagement;
 import com.jero.company.entity.PayContactsManagement;
@@ -96,6 +102,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
     @Resource
     private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService;
     @Resource
+    private SendMessageService sendMessageService;
+    @Resource
     private ContractCreateProjectSendMessageService contractCreateProjectSendMessageService;
 
     /**
@@ -506,11 +514,23 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 
             } else {
                 ValidUtil.validate(commonPeopleVO, NotPack.class);
-
-                payMeetingSituation1.setNeedInvoice(payMeetingSituation.getNeedInvoice());
+                //缴费方式为线上缴费时，判断是否为会议期间
                 String paymentRecord = payMeetingSituation.getPaymentRecord();
-                payMeetingSituation1.setPaymentRecord(paymentRecord);
-                payMeetingSituation1.setOrderCode(payMeetingSituation.getOrderCode());
+                if (payMode.equals(MeetingSubitemCommon.PAY_MODE_2)){
+                    Date startTime = payMeeting.getStartTime();
+                    Date endTime = payMeeting.getEndTime();
+                    //如果不在会议期间，不允许上传缴费凭证
+                    if (!belongCalendar(new Date(),startTime,endTime)) {
+                        throw new JeroBootException("线上缴费时，付款凭证和订单后四位编码只能在会议期间上传");
+                    }
+                    payMeetingSituation1.setPaymentRecord(paymentRecord);
+                    payMeetingSituation1.setOrderCode(payMeetingSituation.getOrderCode());
+                }else {
+                    payMeetingSituation1.setPaymentRecord(paymentRecord);
+
+                }
+                payMeetingSituation1.setNeedInvoice(payMeetingSituation.getNeedInvoice());
+
                 //如果是标协会议判断会员类型
                 if (meetingType.equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
                     //根据企业名称和会员类型不为null判断是否为标协会员