From 7422fb7515ee884c2bbd9f565f1837e4df58cbf5 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 20 Dec 2021 14:42:15 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=90=8C=E6=AD=A5=E8=AF=81=E4=B9=A6?=
 =?UTF-8?q?=E6=9D=A5=E6=AC=BE=E9=82=AE=E5=AF=84=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayMailBillController.java     |   5 +-
 .../com/jero/mail/entity/PayMailBill.java     |   4 +
 .../mail/service/IPayMailBillService.java     |   4 +-
 .../service/impl/PayMailBillServiceImpl.java  | 105 ++++++++++++------
 .../member/entity/TbCertificatePayment.java   |   1 +
 .../jero/member/enums/StandardsTypeEnum.java  |   9 ++
 .../impl/TbCertificatePaymentServiceImpl.java |   2 +-
 .../impl/PayPaymentRecordServiceImpl.java     |  30 +++--
 8 files changed, 114 insertions(+), 46 deletions(-)
 create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/member/enums/StandardsTypeEnum.java

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 67cbc40b..3e3347dd 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
@@ -39,6 +39,7 @@ import com.jero.meeting.entity.PayMeetingSituation;
 import com.jero.meeting.service.IPayMeetingService;
 import com.jero.meeting.service.IPayMeetingSituationService;
 import com.jero.member.entity.*;
+import com.jero.member.enums.StandardsTypeEnum;
 import com.jero.member.service.*;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
@@ -546,7 +547,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 						tbMemberProjectSubitemService.updateById(tbMemberProjectSubitem);
 					}
 					//推送邮寄数据到会员系统
-					payMailBillService.pushSendToStandards(payMailBill, one.getProjectId());
+					payMailBillService.pushSendToStandards(payMailBill, one.getProjectId(), StandardsTypeEnum.STANDARDS);
 				}else if(GlobalConstants.SIX.equals(one.getProjectType())){
 					TbCertificatePayment tbCertificatePayment = tbCertificatePaymentService.getById(one.getProjectId());
 					if(Objects.isNull(tbCertificatePayment)){
@@ -577,7 +578,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 						tbCertificatePaymentService.updateById(tbCertificatePayments);
 					}
 					//推送邮寄数据到会员系统
-					payMailBillService.pushSendToStandards(payMailBill, one.getProjectId());
+					payMailBillService.pushSendToStandards(payMailBill, one.getProjectId(), StandardsTypeEnum.CERTIFICATE);
 				}
 				// 发送给项目负责人
 				if (!StringUtils.isBlank(principalId)) {
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java
index c452f6f7..8c757498 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java
@@ -163,4 +163,8 @@ public class PayMailBill implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "邮寄人（真是姓名）")
     private String mailName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "项目类型")
+    private Integer projectType;
 }
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 78c89250..814aad64 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,6 +8,7 @@ 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.member.enums.StandardsTypeEnum;
 
 import java.util.List;
 
@@ -54,8 +55,9 @@ public interface IPayMailBillService extends IService<PayMailBill> {
      * 推送邮寄数据到会员系统
      * @param payMailBill
      * @param id
+     * @param standardsTypeEnum
      */
-    void pushSendToStandards(PayMailBill payMailBill, String id);
+    void pushSendToStandards(PayMailBill payMailBill, String id, StandardsTypeEnum standardsTypeEnum);
 
     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 d7b0d115..7d047e87 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
@@ -1,6 +1,5 @@
 package com.jero.mail.service.impl;
 
-import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -39,6 +38,7 @@ import com.jero.meeting.mapper.PayMeetingMapper;
 import com.jero.meeting.mapper.PayMeetingSituationMapper;
 import com.jero.meeting.service.IPayMeetingService;
 import com.jero.member.entity.*;
+import com.jero.member.enums.StandardsTypeEnum;
 import com.jero.member.mapper.*;
 import com.jero.member.service.IPayMemberProjectService;
 import com.jero.member.service.ITbCertificatePaymentService;
@@ -184,7 +184,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     throw new JeroBootException("标协会员项目，只能开票一次。");
                 }
                 //推送开票数据到会员系统
-                pushBillToStandards(payMailBill, id);
+                pushBillToStandards(payMailBill, id,StandardsTypeEnum.STANDARDS);
             }
             if (PayIncomeContractCommon.PROJECT_TYPE6.equals(String.valueOf(payMailBillProject.getProjectType()))) {
                 String id = payMailBillProject.getProjectId();
@@ -196,6 +196,8 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                 if (type6List != null && type6List.size() > 0) {
                     throw new JeroBootException("标协证书项目，只能开票一次。");
                 }
+                //推送开票数据到会员系统
+                pushBillToStandards(payMailBill, id,StandardsTypeEnum.CERTIFICATE);
             }
 
         }
@@ -414,11 +416,18 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
      * @param payMailBill
      * @param id
      */
-    private void pushBillToStandards(PayMailBillVO payMailBill, String id) {
-        TbMemberProjectSubitem tbMemberProjectSubitem = tbMemberProjectSubitemMapper.selectById(id);
+    private void pushBillToStandards(PayMailBillVO payMailBill, String id, StandardsTypeEnum standardsTypeEnum) {
         BillingInfo billingInfo = new BillingInfo();
-        billingInfo.setBillNumber(tbMemberProjectSubitem.getBillNumber());
-        billingInfo.setMemberId(tbMemberProjectSubitem.getMemberId());
+
+        if (standardsTypeEnum.equals(StandardsTypeEnum.STANDARDS)) {
+            TbMemberProjectSubitem tbMemberProjectSubitem = tbMemberProjectSubitemMapper.selectById(id);
+            billingInfo.setBillNumber(tbMemberProjectSubitem.getBillNumber());
+            billingInfo.setMemberId(tbMemberProjectSubitem.getMemberId());
+        }else {
+            TbCertificatePayment certificatePayment = certificatePaymentMapper.selectById(id);
+            billingInfo.setBillNumber(certificatePayment.getBillNumber());
+            billingInfo.setMemberId(certificatePayment.getMemberId());
+        }
         billingInfo.setBillNo(payMailBill.getBillNo());
         //调用接口
         AuthenticationUtils.post("/billingInfo/billingInfo/billFromPayment",null,billingInfo);
@@ -428,14 +437,22 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
      * 推送邮寄数据到会员系统
      * @param payMailBill
      * @param id
+     * @param standardsTypeEnum
      */
     @Override
-    public void pushSendToStandards(PayMailBill payMailBill, String id) {
-        TbMemberProjectSubitem tbMemberProjectSubitem = tbMemberProjectSubitemMapper.selectById(id);
+    public void pushSendToStandards(PayMailBill payMailBill, String id, StandardsTypeEnum standardsTypeEnum) {
         BillingInfo billingInfo = new BillingInfo();
-        billingInfo.setBillNumber(tbMemberProjectSubitem.getBillNumber());
-        billingInfo.setMemberId(tbMemberProjectSubitem.getMemberId());
-        billingInfo.setMobile(tbMemberProjectSubitem.getMobile());
+        if (standardsTypeEnum.equals(StandardsTypeEnum.STANDARDS)) {
+            TbMemberProjectSubitem tbMemberProjectSubitem = tbMemberProjectSubitemMapper.selectById(id);
+            billingInfo.setBillNumber(tbMemberProjectSubitem.getBillNumber());
+            billingInfo.setMemberId(tbMemberProjectSubitem.getMemberId());
+            billingInfo.setMobile(tbMemberProjectSubitem.getMobile());
+        }else {
+            TbCertificatePayment certificatePayment = certificatePaymentMapper.selectById(id);
+            billingInfo.setBillNumber(certificatePayment.getBillNumber());
+            billingInfo.setMemberId(certificatePayment.getMemberId());
+            billingInfo.setMobile(certificatePayment.getMobile());
+        }
         billingInfo.setBillNo(payMailBill.getBillNo());
         billingInfo.setSendMethod(payMailBill.getSendMethod());
         billingInfo.setSendDate(payMailBill.getSendDate());
@@ -445,49 +462,67 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
 
     @Override
     public void pushBillEditToStandards(PayMailBill payMailBill, Integer type) {
+        BillingInfo billingInfo = new BillingInfo();
         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);
             }
         }
-
+        billingInfo.setSendMethod(payMailBill.getSendMethod());
+        billingInfo.setPostNo(payMailBill.getPostNo());
+        billingInfo.setSendDate(payMailBill.getSendDate());
+        AuthenticationUtils.post("/billingInfo/billingInfo/postFromPaymentEdit",null,billingInfo);
     }
 
     @Override
     public void addFromStandards(PayMailBill payMailBill) {
         String tbPaymentId = payMailBill.getProjectId();
-        LambdaQueryWrapper<TbMemberProjectSubitem> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(TbMemberProjectSubitem::getTbPaymentId,tbPaymentId);
-        TbMemberProjectSubitem tbMember = tbMemberProjectSubitemMapper.selectOne(wrapper);
-        BigDecimal amountReceivable = tbMember.getAmountReceivable();
-        tbMember.setMakeInvoice(1);
-        tbMember.setMail(1);
-        tbMember.setInvoiceAmount(amountReceivable);
-        tbMember.setPaidAmount(amountReceivable);
-        tbMemberProjectSubitemMapper.updateById(tbMember);
+        BigDecimal amountReceivable;
+        String memberProjectId;
+        String projectId;
+        String companyName;
+        Integer projectType = payMailBill.getProjectType();
+        if (projectType.equals(GlobalConstants.FIVE)) {
+            LambdaQueryWrapper<TbMemberProjectSubitem> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(TbMemberProjectSubitem::getTbPaymentId,tbPaymentId);
+            TbMemberProjectSubitem tbMember = tbMemberProjectSubitemMapper.selectOne(wrapper);
+            amountReceivable = tbMember.getAmountReceivable();
+            memberProjectId = tbMember.getProjectId();
+            projectId = tbMember.getId();
+            companyName = tbMember.getCompanyName();
+            tbMember.setMakeInvoice(1);
+            tbMember.setMail(1);
+            tbMember.setInvoiceAmount(amountReceivable);
+            tbMember.setPaidAmount(amountReceivable);
+            tbMemberProjectSubitemMapper.updateById(tbMember);
+        }else {
+            LambdaQueryWrapper<TbCertificatePayment> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(TbCertificatePayment::getTbPaymentId,tbPaymentId);
+            TbCertificatePayment certificatePayment = certificatePaymentMapper.selectOne(wrapper);
+            amountReceivable = certificatePayment.getAmountReceivable();
+            memberProjectId = certificatePayment.getProjectId();
+            projectId = certificatePayment.getId();
+            companyName = certificatePayment.getCompanyName();
+
+            certificatePayment.setMakeInvoice(1);
+            certificatePayment.setMail(1);
+            certificatePayment.setInvoiceAmount(amountReceivable);
+            certificatePayment.setPaidAmount(amountReceivable);
+            certificatePaymentMapper.updateById(certificatePayment);
+        }
+
         //添加邮寄表
-        String memberProjectId = tbMember.getProjectId();
         TbMemberProject tbMemberProject = tbMemberProjectMapper.selectById(memberProjectId);
         payMailBill.setProjectName(tbMemberProject.getProjectName());
-        payMailBill.setChargeCompanyName(tbMember.getCompanyName());
+        payMailBill.setChargeCompanyName(companyName);
         payMailBill.setInvoiceAmount(amountReceivable);
         payMailBill.setPostStatus(1);
         payMailBill.setPrincipalName("标协管理者");
@@ -497,8 +532,8 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
         //添加关联关系
         PayMailBillProject bmp = new PayMailBillProject();
         bmp.setBillId(payMailBill.getId());
-        bmp.setProjectId(tbMember.getId());
-        bmp.setProjectType(5);
+        bmp.setProjectId(projectId);
+        bmp.setProjectType(projectType);
         bmp.setInvoiceAmount(amountReceivable);
         payMailBillProjectService.save(bmp);
     }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java
index 8db04f7e..6900e966 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java
@@ -107,6 +107,7 @@ public class TbCertificatePayment implements Serializable {
 	@Excel(name = "缴费类型", width = 15)
 
     @ApiModelProperty(value = "缴费类型")
+    @Dict(dicCode = "certificate_payment_type")
     private Integer paymentType;
 
 	/**缴费金额*/
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/enums/StandardsTypeEnum.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/enums/StandardsTypeEnum.java
new file mode 100644
index 00000000..f582d623
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/enums/StandardsTypeEnum.java
@@ -0,0 +1,9 @@
+package com.jero.member.enums;
+
+/**
+ * @author liJiaRao
+ * @date 2021-12-20 10:38
+ */
+public enum StandardsTypeEnum {
+    STANDARDS,CERTIFICATE
+}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbCertificatePaymentServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbCertificatePaymentServiceImpl.java
index 6c8151aa..6b68397d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbCertificatePaymentServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbCertificatePaymentServiceImpl.java
@@ -25,7 +25,7 @@ public class TbCertificatePaymentServiceImpl extends ServiceImpl<TbCertificatePa
 	 */
 	@Override
     public void add(TbCertificatePayment tbCertificatePayment) {
-        save(tbCertificatePayment);
+        saveOrUpdate(tbCertificatePayment);
     }
 
 	/**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
index 0ab0a485..466a4151 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
@@ -170,7 +170,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
         }
         //证书到账推送到会员系统
         if(typr6List.size()>0){
-            JSONObject jsonObject = AuthenticationUtils.postResult("/certificatePaymentInfo/incomingPaymentCheckCertificate", null, typr5List);
+            JSONObject jsonObject = AuthenticationUtils.postResult("/certificatePaymentInfo/incomingPaymentCheckCertificate", null, typr6List);
         }
     }
     /**
@@ -512,15 +512,22 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
             tbMember.setMemberNo(memberInfo.getMemberNo());
             tbMember.setMemberType(memberInfo.getMemberType());
             tbMember.setMemberStatus(memberInfo.getMemberStatus());
-            tbMemberProjectSubitemMapper.updateById(tbMember);
+            tbMember.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
             payPaymentRecord.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
         }else {
+            tbMember.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
             payPaymentRecord.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
         }
+        tbMemberProjectSubitemMapper.updateById(tbMember);
         //插入来款记录表
         LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
-        payPaymentRecord.setReviewerId(sysUser.getId());
-        payPaymentRecord.setReviewerName(sysUser.getRealname());
+        if (sysUser!=null) {
+            payPaymentRecord.setReviewerId(sysUser.getId());
+            payPaymentRecord.setReviewerName(sysUser.getRealname());
+        }else {
+            payPaymentRecord.setReviewerId("e9ca23d68d884d4ebb19d07889727dae");
+            payPaymentRecord.setReviewerName("标协管理员");
+        }
         payPaymentRecord.setReviewTime(new Date());
         payPaymentRecord.setProjectId(tbMember.getId());
         payPaymentRecord.setProjectType(Integer.valueOf(PayIncomeContractCommon.PROJECT_TYPE5));
@@ -550,14 +557,23 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
             //更新主列表
             certificatePayment.setPaidAmount(newPaidAmount);
             certificatePayment.setInAccount(inAccount);
-            certificatePaymentMapper.updateById(certificatePayment);
+            certificatePayment.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
+            payPaymentRecord.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
         }else {
+            certificatePayment.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
             payPaymentRecord.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
         }
+        certificatePaymentMapper.updateById(certificatePayment);
+
         //插入来款记录表
         LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
-        payPaymentRecord.setReviewerId(sysUser.getId());
-        payPaymentRecord.setReviewerName(sysUser.getRealname());
+        if (sysUser!=null) {
+            payPaymentRecord.setReviewerId(sysUser.getId());
+            payPaymentRecord.setReviewerName(sysUser.getRealname());
+        }else {
+            payPaymentRecord.setReviewerId("e9ca23d68d884d4ebb19d07889727dae");
+            payPaymentRecord.setReviewerName("标协管理员");
+        }
         payPaymentRecord.setReviewTime(new Date());
         payPaymentRecord.setProjectId(certificatePayment.getId());
         payPaymentRecord.setProjectType(Integer.valueOf(PayIncomeContractCommon.PROJECT_TYPE6));