From c3247f11d26513f8ca2233a17af4170937dc124c Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 24 Oct 2023 14:30:22 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=9A=E8=AE=AE=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E6=97=B6=EF=BC=8C=E5=8F=96=E9=82=AE=E5=AF=84?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E5=9C=A8=E5=8F=82=E4=BC=9A=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit d9358976708b6ee80d8b787fa5b557f712ca9baa)
---
 db/23年10月23日变更.sql                       | 16 +++++++
 .../mail/mapper/xml/PayMailBillMapper.xml     | 45 +++----------------
 .../mail/service/IPayMailBillService.java     |  3 +-
 .../service/impl/PayMailBillServiceImpl.java  | 35 ++++++++++-----
 .../impl/PayMeetingSituationServiceImpl.java  |  9 +++-
 ...PayPayMemberProjectSubitemServiceImpl.java |  2 +-
 .../impl/PayCommonProjectServiceImpl.java     |  2 +-
 .../PayWorkingGroupSubItemServiceImpl.java    |  2 +-
 8 files changed, 58 insertions(+), 56 deletions(-)
 create mode 100644 db/23年10月23日变更.sql

diff --git a/db/23年10月23日变更.sql b/db/23年10月23日变更.sql
new file mode 100644
index 00000000..131bd67c
--- /dev/null
+++ b/db/23年10月23日变更.sql
@@ -0,0 +1,16 @@
+alter table pay_meeting
+    add is_wasic                  tinyint        null comment '是否WASIC',
+    add link_topics               varchar(50)    null comment '关联课题',
+    add meeting_costs_two_topic   decimal(12, 2) null comment '会议费用（2个课题）',
+    add meeting_costs_three_topic decimal(12, 2) null comment '会议费用（3个及以上）';
+update pay_meeting set is_wasic = 0 where meeting_type = 3 and is_wasic is null;
+alter table pay_meeting_situation
+    add choice_topic varchar(50) null comment '选择课题';
+
+INSERT INTO sys_dict ( id, dict_name, dict_code, description, del_flag, create_by, create_time ) VALUES ( '1716348751477309441', '会议关联课题', 'linkTopics', '', 0, 'LKGLZ', '2023-10-23 15:00:05' );
+INSERT INTO sys_dict_item ( id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time ) VALUES ( '1716348946118180866', '1716348751477309441', '汽车网络安全与数据安全标准合规专题', '1', '', 1, 1, 'LKGLZ', '2023-10-23 15:00:51' );
+INSERT INTO sys_dict_item ( id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time ) VALUES ( '1716349088112148481', '1716348751477309441', '智能网汽车标准化领航及标准路线图专题', '2', '', 2, 1, 'LKGLZ', '2023-10-23 15:01:25' );
+INSERT INTO sys_dict_item ( id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time ) VALUES ( '1716349139207159809', '1716348751477309441', '汽车地毯专题', '3', '', 3, 1, 'LKGLZ', '2023-10-23 15:01:37' );
+INSERT INTO sys_dict_item ( id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time ) VALUES ( '1716349212045443073', '1716348751477309441', '动力电池安全专题', '4', '', 4, 1, 'LKGLZ', '2023-10-23 15:01:55' );
+INSERT INTO sys_dict_item ( id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time ) VALUES ( '1716349338696646657', '1716348751477309441', '弱势道路交通参与者（VRU）保护专题', '5', '', 5, 1, 'LKGLZ', '2023-10-23 15:02:25' );
+INSERT INTO sys_dict_item ( id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time ) VALUES ( '1716349372095889410', '1716348751477309441', '免费专题', '6', '', 6, 1, 'LKGLZ', '2023-10-23 15:02:33' );
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
index 9df722ba..d0a75d62 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
@@ -177,36 +177,6 @@
     <update id="updateByProjectId">
         update pay_mail_bill
         <set>
-            <if test="updated.id != null and updated.id != ''">
-                id = #{updated.id},
-            </if>
-            <if test="updated.createBy != null and updated.createBy != ''">
-                create_by = #{updated.createBy},
-            </if>
-            <if test="updated.createTime != null">
-                create_time = #{updated.createTime},
-            </if>
-            <if test="updated.updateBy != null and updated.updateBy != ''">
-                update_by = #{updated.updateBy},
-            </if>
-            <if test="updated.updateTime != null">
-                update_time = #{updated.updateTime},
-            </if>
-            <if test="updated.billNo != null and updated.billNo != ''">
-                bill_no = #{updated.billNo},
-            </if>
-            <if test="updated.invoiceAmount != null">
-                invoice_amount = #{updated.invoiceAmount},
-            </if>
-            <if test="updated.postStatus != null">
-                post_status = #{updated.postStatus},
-            </if>
-            <if test="updated.sendMethod != null">
-                send_method = #{updated.sendMethod},
-            </if>
-            <if test="updated.postNo != null and updated.postNo != ''">
-                post_no = #{updated.postNo},
-            </if>
             <if test="updated.contactId != null and updated.contactId != ''">
                 contact_id = #{updated.contactId},
             </if>
@@ -216,17 +186,14 @@
             <if test="updated.contactMobile != null and updated.contactMobile != ''">
                 contact_mobile = #{updated.contactMobile},
             </if>
-            <if test="updated.billDate != null">
-                bill_date = #{updated.billDate},
+            <if test="updated.email != null">
+                email = #{updated.email},
             </if>
-            <if test="updated.sendDate != null">
-                send_date = #{updated.sendDate},
+            <if test="updated.postalCode != null">
+                postal_code = #{updated.postalCode},
             </if>
-            <if test="updated.remark != null and updated.remark != ''">
-                remark = #{updated.remark},
-            </if>
-            <if test="updated.projectName != null and updated.projectName != ''">
-                project_name = #{updated.projectName},
+            <if test="updated.contactAddress != null and updated.contactAddress != ''">
+                contact_address = #{updated.contactAddress},
             </if>
         </set>
         <where>
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java
index f7fdd5ed..109726f4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java
@@ -92,8 +92,9 @@ public interface IPayMailBillService extends IService<PayMailBill> {
      * 如果有邮寄信息更新邮寄联系人信息
      * @param ContactId 邮寄联系人id
      * @param projectId 项目id
+     * @param payMailBill
      */
-    void updateContactByProjectId(String ContactId,String projectId);
+    void updateContactByProjectId(String ContactId, String projectId, PayMailBill payMailBill);
 
     IPage<PayMailBill> contactsSearchPageList(Page<PayMailBill> page, String userId, QueryWrapper<PayMailBill> queryWrapper);
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
index 75a78a92..2968b578 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
@@ -173,6 +173,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
      * @param payMailBill
      * @return
      */
+    @Override
     @Transactional
     public Result<?> addPayBill(PayMailBillVO payMailBill) {
         //票据关联项目表
@@ -212,7 +213,16 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                 //推送开票数据到会员系统
                 pushBillToStandards(payMailBill, id,StandardsTypeEnum.CERTIFICATE);
             }
-
+            //会议项目开票时，获取参会人配置的邮寄信息
+            if (PayIncomeContractCommon.PROJECT_TYPE3.equals(String.valueOf(payMailBillProject.getProjectType()))) {
+                String id = payMailBillProject.getProjectId();
+                PayMeetingSituation payMeetingSituation = payMeetingSituationMapper.selectById(id);
+                String postContactId = payMeetingSituation.getPostContactId();
+                if (StringUtils.isNotBlank(postContactId)){
+                    payMailBill.setContactAddress(payMeetingSituation.getPostContactAddress());
+                    payMailBill.setPostalCode(payMeetingSituation.getPostCode());
+                }
+            }
         }
 
         //更新项目表开票状态，逗号拼接邮寄信息
@@ -569,20 +579,23 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
     }
 
     @Override
-    public void updateContactByProjectId(String ContactId, String projectId) {
+    public void updateContactByProjectId(String ContactId, String projectId, PayMailBill payMailBill) {
         PayContactsManagement contact= payContactsManagementMapper.selectById(ContactId);
         if (contact == null){
             return;
         }
-        PayMailBill payMailBill = new PayMailBill();
-        payMailBill.setContactId(ContactId);
-        payMailBill.setContactName(contact.getName());
-        payMailBill.setContactMobile(contact.getPhone());
-        payMailBill.setEmail(contact.getEmail());
-        payMailBill.setPostalCode(contact.getPostalCode());
-        payMailBill.setContactAddress(contact.getContactAddress());
-
-        payMailBillMapper.updateByProjectId(payMailBill,projectId);
+        PayMailBill mailBill = new PayMailBill();
+        mailBill.setContactId(ContactId);
+        mailBill.setContactName(contact.getName());
+        mailBill.setContactMobile(contact.getPhone());
+        mailBill.setEmail(contact.getEmail());
+        mailBill.setPostalCode(contact.getPostalCode());
+        mailBill.setContactAddress(contact.getContactAddress());
+        if (payMailBill != null){
+            mailBill.setPostalCode(payMailBill.getPostalCode());
+            mailBill.setContactAddress(payMailBill.getContactAddress());
+        }
+        payMailBillMapper.updateByProjectId(mailBill,projectId);
     }
 
     @Override
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 031214b2..92d0fa86 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
@@ -1058,8 +1058,13 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         //处理打包情况
         //handlePack(payMeetingSituation1);
         //    如果有邮寄信息更新邮寄联系人信息
-        String mailContactsId = payMeetingSituationVO.getPostContactId();
-        payMailBillService.updateContactByProjectId(mailContactsId,id);
+        String postContactId = payMeetingSituationVO.getPostContactId();
+        if (StringUtils.isNotBlank(postContactId)){
+            PayMailBill payMailBill = new PayMailBill();
+            payMailBill.setContactAddress(payMeetingSituationVO.getPostContactAddress());
+            payMailBill.setPostalCode(payMeetingSituationVO.getPostCode());
+            payMailBillService.updateContactByProjectId(postContactId,id,payMailBill);
+        }
     }
 
     /**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java
index ee59d681..9bff200e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java
@@ -252,7 +252,7 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
 		saveOrUpdate(payMemberProjectSubitem);
 		//    如果有邮寄信息更新邮寄联系人信息
 		String mailContactsId = payMemberProjectSubitem.getPostContactId();
-		payMailBillService.updateContactByProjectId(mailContactsId,payMemberProjectSubitem.getId());
+		payMailBillService.updateContactByProjectId(mailContactsId,payMemberProjectSubitem.getId(), null);
 	}
 
 	/**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
index 94618a9e..cca6d028 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
@@ -261,7 +261,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
         payCommonProjectService.update(updatePayCommonProject);
     //    如果有邮寄信息更新邮寄联系人信息
         String mailContactsId = payCommonProject.getMailContactsId();
-        payMailBillService.updateContactByProjectId(mailContactsId,payCommonProject.getId());
+        payMailBillService.updateContactByProjectId(mailContactsId,payCommonProject.getId(), null);
     }
 
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
index 230d023e..dab07c73 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
@@ -453,7 +453,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
         payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem);
         //    如果有邮寄信息更新邮寄联系人信息
         String mailContactsId = payWorkingGroupSubItem.getMailContactsId();
-        payMailBillService.updateContactByProjectId(mailContactsId, workingGroupSubItemId);
+        payMailBillService.updateContactByProjectId(mailContactsId, workingGroupSubItemId, null);
     }
 
     @Override