From 536df97fb7e6b365202c5388cfcd093079a65042 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 20 Jul 2023 10:27:32 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=8F=82=E4=BC=9A=E4=BA=BA=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E4=BF=A1=E6=81=AF=E6=B2=A1=E6=9C=89=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMeetingServiceImpl.java   | 21 +++++++++++--------
 .../impl/PayMeetingSituationServiceImpl.java  |  1 +
 .../com/jero/meeting/vo/CommonPeopleVO.java   |  6 ++++++
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
index 23d42929..2c9caa21 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
@@ -1,6 +1,5 @@
 package com.jero.meeting.service.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -60,7 +59,6 @@ import com.jero.project.service.IPayWorkingGroupSubItemService;
 import com.jero.standards.xuanguan.stablecrosstraining.entity.StableCrossTraining;
 import com.jero.standards.xuanguan.stablecrosstraining.service.IStableCrossTrainingService;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.util.Strings;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.util.CollectionUtils;
 import org.jetbrains.annotations.NotNull;
@@ -159,11 +157,12 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
             );
             meetingHotelContactsService.saveBatch(hotelContactsList);
         }
+        Integer meetingType = payMeeting.getMeetingType();
         //会议联系人
         List<PayMeetingContacts> meetingContactsList = payMeetingVO.getMeetingContactsList();
-        addMeetingContactsList(meetingContactsList, payMeeting.getId());
+        addMeetingContactsList(meetingContactsList, payMeeting.getId(),meetingType.equals(MeetingCommon.STANDARD_MEETING_INT));
         //新增会员系统标协会议
-        if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
+        if (meetingType.equals(MeetingCommon.STANDARD_MEETING_INT)) {
             String directorId = payMeeting.getDirectorId();
             LoginUser loginUser = sysBaseAPI.getUserById(directorId);
             payMeeting.setDirectorName(loginUser.getRealname());
@@ -260,9 +259,10 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
             );
             meetingHotelContactsService.saveBatch(hotelContactsList);
         }
+        Integer meetingType = meeting.getMeetingType();
         //会议联系人
         List<PayMeetingContacts> meetingContactsList = payMeeting.getMeetingContactsList();
-        addMeetingContactsList(meetingContactsList, payMeeting.getId());
+        addMeetingContactsList(meetingContactsList, payMeeting.getId(), meetingType.equals(MeetingCommon.STANDARD_MEETING_INT));
     }
 
     public void delWithStandardForUpdate(PayMeeting payMeeting){
@@ -318,11 +318,12 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
             );
             meetingHotelContactsService.saveBatch(hotelContactsList);
         }
+        Integer meetingType = payMeeting.getMeetingType();
         //会议联系人
         List<PayMeetingContacts> meetingContactsList = payMeetingVO.getMeetingContactsList();
-        addMeetingContactsList(meetingContactsList, payMeeting.getId());
+        addMeetingContactsList(meetingContactsList, payMeeting.getId(), meetingType.equals(MeetingCommon.STANDARD_MEETING_INT));
         //编辑标协会议
-        if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
+        if (meetingType.equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
             String directorId = payMeeting.getDirectorId();
             LoginUser loginUser = sysBaseAPI.getUserById(directorId);
             payMeeting.setDirectorName(loginUser.getRealname());
@@ -345,7 +346,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
     /**
      * 增加会议联系人
      */
-    private void addMeetingContactsList(List<PayMeetingContacts> meetingContactsList, String meetingId) {
+    private void addMeetingContactsList(List<PayMeetingContacts> meetingContactsList, String meetingId, boolean needPushStandard) {
 
         if (meetingContactsList == null) {
             return;
@@ -374,7 +375,9 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
                     meetingContacts.setMeetingId(meetingId)
             );
             meetingContactsService.saveBatch(addMeetingContactsList);
-            AuthenticationUtils.post("/stablecrosstraining/stableCrossTraining/addMeetingContactsList",null,addMeetingContactsList);
+            if (needPushStandard){
+                AuthenticationUtils.post("/stablecrosstraining/stableCrossTraining/addMeetingContactsList",null,addMeetingContactsList);
+            }
         }
     }
 
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 7cf1187b..e30fa00a 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
@@ -1189,6 +1189,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                 } else {
                     ValidUtil.validate(updateInvoicePram, UpdateInvoicePram.needInvoice_2.class);
                 }
+                BeanUtils.copyProperties(updateInvoicePram, payMeetingSituation1);
             }
             String paymentRecord = payMeetingSituation.getPaymentRecord();
             String orderCode = payMeetingSituation.getOrderCode();
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/CommonPeopleVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/CommonPeopleVO.java
index 25246fd1..c90e0a54 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/CommonPeopleVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/CommonPeopleVO.java
@@ -1,5 +1,6 @@
 package com.jero.meeting.vo;
 
+import com.jero.common.aspect.annotation.Dict;
 import com.jero.meeting.valid.group.NotPack;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -55,4 +56,9 @@ public class CommonPeopleVO{
     @ApiModelProperty(value = "缴费凭证")
     private String paymentRecord;
 
+    /**发票项目*/
+    @Dict(dicCode = "invoice_project")
+    @ApiModelProperty(value = "发票项目")
+    private Integer invoiceProject;
+
 }