From b62b46cb81d85f9f55087cbe6f6c281b06a5beaa Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 17 Dec 2021 20:01:45 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=88=B0=E8=B4=A6=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=A0=87=E5=8D=8F=E8=AF=81=E4=B9=A6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayMailBillController.java     |  4 +-
 .../mail/service/IPayMailBillService.java     |  4 +-
 .../service/impl/PayMailBillServiceImpl.java  | 45 ++++++++++++-------
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
index 1ab393dd..67cbc40b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
@@ -273,7 +273,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 						 listId.add(meetingTemporary);
 					 }
 					 //推送邮寄数据到会员系统
-					 payMailBillService.pushBillEditToStandards(payMailBill);
+					 payMailBillService.pushBillEditToStandards(payMailBill,GlobalConstants.FIVE);
 				 }else if(GlobalConstants.SIX.equals(one.getProjectType())){
 					 TbCertificatePayment tbCertificatePayment = tbCertificatePaymentService.getById(one.getProjectId());
 					 if(Objects.isNull(tbCertificatePayment)){
@@ -293,7 +293,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 						 listId.add(meetingTemporary);
 					 }
 					 //推送邮寄数据到会员系统
-					 payMailBillService.pushBillEditToStandards(payMailBill);
+					 payMailBillService.pushBillEditToStandards(payMailBill, GlobalConstants.SIX);
 
 				 }
 				 // 发送给项目负责人
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 1fc4c3ae..78c89250 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
@@ -8,8 +8,6 @@ import com.jero.common.api.vo.Result;
 import com.jero.company.entity.PayContactsManagement;
 import com.jero.mail.PayMailBillVO;
 import com.jero.mail.entity.PayMailBill;
-import com.jero.mail.entity.PayMailBillSearch;
-import com.jero.payment.entity.PayPaymentRecord;
 
 import java.util.List;
 
@@ -59,7 +57,7 @@ public interface IPayMailBillService extends IService<PayMailBill> {
      */
     void pushSendToStandards(PayMailBill payMailBill, String id);
 
-    void pushBillEditToStandards(PayMailBill payMailBill);
+    void pushBillEditToStandards(PayMailBill payMailBill, Integer type);
 
     /**
      * 接收会员系统开票邮寄信息
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 816bfff1..34d93b29 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
@@ -10,18 +10,17 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
 import com.jero.common.common.ProjectCommon;
+import com.jero.common.constant.GlobalConstants;
 import com.jero.common.dto.SendMessageDTO;
 import com.jero.common.enums.CompanyMessageEnums;
 import com.jero.common.enums.ManagementMessageEnums;
 import com.jero.common.exception.JeroBootException;
-import com.jero.common.service.ProjectDetailService;
 import com.jero.common.service.SendMessageService;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.AuthenticationUtils;
 import com.jero.common.util.PasswordUtil;
 import com.jero.company.entity.PayCompanyManagement;
 import com.jero.company.entity.PayContactsManagement;
-import com.jero.company.mapper.PayCompanyManagementMapper;
 import com.jero.company.mapper.PayContactsManagementMapper;
 import com.jero.company.service.IPayCompanyManagementService;
 import com.jero.company.service.IPayContactsManagementService;
@@ -30,7 +29,6 @@ import com.jero.mail.PayMailBillVO;
 import com.jero.mail.entity.BillingInfo;
 import com.jero.mail.entity.PayMailBill;
 import com.jero.mail.entity.PayMailBillProject;
-import com.jero.mail.entity.PayMailBillSearch;
 import com.jero.mail.mapper.PayMailBillMapper;
 import com.jero.mail.mapper.PayMailBillProjectMapper;
 import com.jero.mail.service.IPayMailBillProjectService;
@@ -43,12 +41,10 @@ import com.jero.meeting.service.IPayMeetingService;
 import com.jero.member.entity.*;
 import com.jero.member.mapper.*;
 import com.jero.member.service.IPayMemberProjectService;
+import com.jero.member.service.ITbCertificatePaymentService;
 import com.jero.member.service.ITbMemberProjectService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
-import com.jero.payment.entity.PayPaymentRecord;
-import com.jero.payment.service.IPayPaymentRecordService;
-import com.jero.payment.vo.TbCheckVo;
 import com.jero.project.entity.PayCommonProject;
 import com.jero.project.entity.PayWorkingGroup;
 import com.jero.project.entity.PayWorkingGroupSubItem;
@@ -63,7 +59,6 @@ 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.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -131,6 +126,8 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
     private IPayMeetingService payMeetingService;
     @Resource
     private IPayMemberProjectService memberProjectService;
+    @Resource
+    private ITbCertificatePaymentService certificatePaymentService;
 
 
     @Override
@@ -452,17 +449,31 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
     }
 
     @Override
-    public void pushBillEditToStandards(PayMailBill payMailBill) {
-        TbMemberProjectSubitem tbMemberProjectSubitem = tbMemberProjectSubitemMapper.selectById(payMailBill.getProjectId());
-        //如果能是标协会员项目就推送到会员系统
-        if (Objects.nonNull(tbMemberProjectSubitem)) {
-            BillingInfo billingInfo = new BillingInfo();
-            billingInfo.setBillNumber(tbMemberProjectSubitem.getBillNumber());
-            billingInfo.setSendMethod(payMailBill.getSendMethod());
-            billingInfo.setPostNo(payMailBill.getPostNo());
-            billingInfo.setSendDate(payMailBill.getSendDate());
-            AuthenticationUtils.post("/billingInfo/billingInfo/postFromPaymentEdit",null,billingInfo);
+    public void pushBillEditToStandards(PayMailBill payMailBill, Integer type) {
+        if (type.equals(GlobalConstants.FIVE)){
+            TbMemberProjectSubitem tbMemberProjectSubitem = tbMemberProjectSubitemMapper.selectById(payMailBill.getProjectId());
+            //如果能是标协会员项目就推送到会员系统
+            if (Objects.nonNull(tbMemberProjectSubitem)) {
+                BillingInfo billingInfo = new BillingInfo();
+                billingInfo.setBillNumber(tbMemberProjectSubitem.getBillNumber());
+                billingInfo.setSendMethod(payMailBill.getSendMethod());
+                billingInfo.setPostNo(payMailBill.getPostNo());
+                billingInfo.setSendDate(payMailBill.getSendDate());
+                AuthenticationUtils.post("/billingInfo/billingInfo/postFromPaymentEdit",null,billingInfo);
+            }
+        }else {
+            TbCertificatePayment certificatePayment = certificatePaymentService.getById(payMailBill.getProjectId());
+            //如果能是标协证书项目就推送到会员系统
+            if (Objects.nonNull(certificatePayment)) {
+                BillingInfo billingInfo = new BillingInfo();
+                billingInfo.setBillNumber(certificatePayment.getBillNumber());
+                billingInfo.setSendMethod(payMailBill.getSendMethod());
+                billingInfo.setPostNo(payMailBill.getPostNo());
+                billingInfo.setSendDate(payMailBill.getSendDate());
+                AuthenticationUtils.post("/billingInfo/billingInfo/postFromPaymentEdit",null,billingInfo);
+            }
         }
+
     }
 
     @Override