From b8e7fdbd9dcc99c852431fae378573d52f11213e Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 22 Dec 2021 17:02:25 +0800
Subject: [PATCH] =?UTF-8?q?fix=20fix=2045775=20=E5=9C=A8=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=BC=80=E7=A5=A81=E5=85=83=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=A8=E6=9D=A5=E6=AC=BE=E7=B3=BB=E7=BB=9F=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=85=A8=E9=A2=9D=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMailBillServiceImpl.java  | 13 ++++-----
 .../impl/PayPaymentRecordServiceImpl.java     | 27 +++++++++----------
 2 files changed, 18 insertions(+), 22 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 7d047e87..02e1ad78 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
@@ -485,6 +485,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
     @Override
     public void addFromStandards(PayMailBill payMailBill) {
         String tbPaymentId = payMailBill.getProjectId();
+        BigDecimal invoiceAmount = payMailBill.getInvoiceAmount();
         BigDecimal amountReceivable;
         String memberProjectId;
         String projectId;
@@ -494,28 +495,24 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
             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);
+            tbMember.setInvoiceAmount(invoiceAmount);
             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);
+            certificatePayment.setInvoiceAmount(invoiceAmount);
             certificatePaymentMapper.updateById(certificatePayment);
         }
 
@@ -523,7 +520,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
         TbMemberProject tbMemberProject = tbMemberProjectMapper.selectById(memberProjectId);
         payMailBill.setProjectName(tbMemberProject.getProjectName());
         payMailBill.setChargeCompanyName(companyName);
-        payMailBill.setInvoiceAmount(amountReceivable);
+        payMailBill.setInvoiceAmount(invoiceAmount);
         payMailBill.setPostStatus(1);
         payMailBill.setPrincipalName("标协管理者");
         payMailBill.setContactMobile(PasswordUtil.decrypt(payMailBill.getContactMobile()));
@@ -534,7 +531,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
         bmp.setBillId(payMailBill.getId());
         bmp.setProjectId(projectId);
         bmp.setProjectType(projectType);
-        bmp.setInvoiceAmount(amountReceivable);
+        bmp.setInvoiceAmount(invoiceAmount);
         payMailBillProjectService.save(bmp);
     }
 
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 bf305289..5f78a084 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
@@ -521,24 +521,23 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
             tbMember.setMemberStatus(memberInfo.getMemberStatus());
             tbMember.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
             payPaymentRecord.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
+            //插入来款记录表
+            LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+            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));
+            payPaymentRecordMapper.insert(payPaymentRecord);
         }else {
             tbMember.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
-            payPaymentRecord.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
         }
         tbMemberProjectSubitemMapper.updateById(tbMember);
-        //插入来款记录表
-        LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
-        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));
-        payPaymentRecordMapper.insert(payPaymentRecord);
         return Result.OK("添加成功！");
     }