From 9842e1ce3db05ae569e26b1f6c30ae1d07610601 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 7 Jan 2022 09:55:32 +0800
Subject: [PATCH] =?UTF-8?q?fix=2046870=20=E7=90=86=E4=BA=8B=E4=BC=9A-?=
 =?UTF-8?q?=E7=90=86=E4=BA=8B=E4=BC=9A=E4=BC=9A=E8=AE=AE=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?--=E7=BC=96=E8=BE=91=E5=8F=82=E4=BC=9A=E4=BA=BA,=E5=8F=AA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=8C=E7=A8=8B=E4=BF=A1=E6=81=AF,?=
 =?UTF-8?q?=E4=BB=8D=E7=84=B6=E6=8A=A5=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayMeetingSituationServiceImpl.java  | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 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 06db5507..4d9d785a 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
@@ -140,7 +140,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
     private IPayMeetingContactsService meetingContactsService;
 
 
-    private static final String[] CAN_MODIFY_LIST = new String[]{"arrivalTime", "departureTime", "checkInHotel"};
+    private static final String[] CAN_MODIFY_LIST =
+            new String[]{"arrivalTime", "departureTime", "checkInHotel"};
 
     /**
      * 保存
@@ -930,17 +931,26 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         payMeetingSituationVO.setAmountReceivable(payMeetingSituation.getAmountReceivable());
         BeanUtils.copyProperties(payMeetingSituationVO, payMeetingSituation);
         //处理校验参会人信息
-        PayMeetingSituation payMeetingSituation1 = getPayMeetingSituation(payMeetingSituation);
-        //判断是否修改缴费凭证
+        PayMeetingSituation payMeetingSituation1;
+        //判断是否审核通过
         Integer checkResult = oldObject.getCheckResult();
-        if (Objects.equals(checkResult, MeetingSubitemCommon.SIGNUP_STATUS_1)) {
-            ObjRecordUtilModule objRecordUtilModule = ObjRecordUtil.addRecord(oldObject, payMeetingSituation1);
+        Integer registerCheckResult = oldObject.getRegisterCheckResult();
+
+        if (Objects.equals(checkResult, MeetingSubitemCommon.SIGNUP_STATUS_1) && Objects.equals(registerCheckResult, MeetingSubitemCommon.SIGNUP_STATUS_1)) {
+            /*ObjRecordUtilModule objRecordUtilModule = ObjRecordUtil.addRecord(oldObject, payMeetingSituation1);
             List<String> fieldNames = objRecordUtilModule.getFieldNames();
             List<String> canModifyList = Arrays.asList(CAN_MODIFY_LIST);
             boolean containsAll = canModifyList.containsAll(fieldNames);
             if (!containsAll) {
                 throw new JeroBootException("审核通过之后只允许修改行程信息");
-            }
+            }*/
+            payMeetingSituation1 = new PayMeetingSituation();
+            payMeetingSituation1.setId(payMeetingSituationVO.getId());
+            payMeetingSituation1.setArrivalTime(payMeetingSituationVO.getArrivalTime());
+            payMeetingSituation1.setDepartureTime(payMeetingSituationVO.getDepartureTime());
+            payMeetingSituation1.setCheckInHotel(payMeetingSituationVO.getCheckInHotel());
+        }else {
+            payMeetingSituation1 = getPayMeetingSituation(payMeetingSituation);
         }
         //如果是对接人修改的
         if (sysUserId.equals(dockId)) {