From b8d3cbb693446f81e4223c7afd31bbad6c707656 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 13 Jan 2022 15:11:15 +0800
Subject: [PATCH] =?UTF-8?q?fix=2046920=20=E5=88=B0=E8=B4=A6=E5=BC=80?=
 =?UTF-8?q?=E7=A5=A8--=E5=9C=A8=E6=9D=A5=E6=AC=BE=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=AD=E5=BC=80=E7=A5=A8=E5=90=8E,=E5=9C=A8=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E7=B3=BB=E7=BB=9F=E4=B8=AD=E9=82=AE=E5=AF=84,?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mail/service/impl/PayMailBillServiceImpl.java   | 13 +++++++++++--
 .../java/com/jero/quartz/job/MemberProjectJob.java  |  2 ++
 2 files changed, 13 insertions(+), 2 deletions(-)

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 47635683..0fb33363 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
@@ -59,6 +59,7 @@ import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -515,7 +516,15 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
             certificatePayment.setInvoiceAmount(invoiceAmount);
             certificatePaymentMapper.updateById(certificatePayment);
         }
-
+        LambdaQueryWrapper<PayMailBillProject> payMailBillProjectQueryWrapper = new LambdaQueryWrapper<>();
+        payMailBillProjectQueryWrapper.eq(PayMailBillProject::getProjectId,projectId);
+        List<PayMailBillProject> payMailBillProjectList = payMailBillProjectService.list(payMailBillProjectQueryWrapper);
+        if (!payMailBillProjectList.isEmpty()) {
+            PayMailBillProject payMailBillProject = payMailBillProjectList.get(0);
+            String billId = payMailBillProject.getBillId();
+            PayMailBill mailBill = payMailBillService.getById(billId);
+            BeanUtils.copyProperties(mailBill,payMailBill);
+        }
         //添加邮寄表
         TbMemberProject tbMemberProject = tbMemberProjectMapper.selectById(memberProjectId);
         payMailBill.setProjectName(tbMemberProject.getProjectName());
@@ -525,7 +534,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
         payMailBill.setPrincipalName("标协管理者");
         payMailBill.setContactMobile(PasswordUtil.decrypt(payMailBill.getContactMobile()));
         payMailBill.setBillDate(payMailBill.getSendDate());
-        payMailBillService.save(payMailBill);
+        payMailBillService.saveOrUpdate(payMailBill);
         //添加关联关系
         PayMailBillProject bmp = new PayMailBillProject();
         bmp.setBillId(payMailBill.getId());
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/quartz/job/MemberProjectJob.java b/jero-boot-incoming-payment/src/main/java/com/jero/quartz/job/MemberProjectJob.java
index 8ada8ef0..4169b36b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/quartz/job/MemberProjectJob.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/quartz/job/MemberProjectJob.java
@@ -33,6 +33,8 @@ public class MemberProjectJob implements Job{
             memberProject = new TbMemberProject();
             memberProject.setProjectName(projectName);
             memberProject.setYear(String.valueOf(year));
+            memberProject.setDirectorId("e9ca23d68d884d4ebb19d07889727dae");
+            memberProject.setDirectorName("BXGLZ");
             memberProjectService.save(memberProject);
         }
     }