From bedc4f6b2afacaccf8143c6b7a20b1e955952a01 Mon Sep 17 00:00:00 2001
From: baozhipeng <961815525@qq.com>
Date: Thu, 16 Sep 2021 19:21:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=80=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMailBillServiceImpl.java  | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 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 66dce909..45566552 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
@@ -282,7 +282,11 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
         int makeInvoice=4;
         BigDecimal amountReceivable=new BigDecimal("0");//应收金额
         Integer needInvoice = 0;//是否需要发票
-        BigDecimal invoiceAmount=new BigDecimal("0");//开票金额
+        BigDecimal invoiceAmount=payMailBillProject.getInvoiceAmount();//本次开票金额
+        if(invoiceAmount ==null){
+            invoiceAmount=new BigDecimal("0");
+        }
+        BigDecimal oldInvoiceAmount=new BigDecimal("0");//开票金额
         switch (payMailBillProject.getProjectType().toString()) {
 
             // 普通项目
@@ -290,35 +294,45 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                 PayCommonProject payCommonProject = payCommonProjectMapper.selectById(payMailBillProject.getProjectId());
                 amountReceivable = payCommonProject.getReceivableAmount();//应收
                 needInvoice = payCommonProject.getNeedInvoice();//是否需要发票
-                invoiceAmount = payCommonProject.getInvoiceAmount();//开票金额
+                oldInvoiceAmount = payCommonProject.getInvoiceAmount();
+                //之前开票总额+本次开票金额
+                invoiceAmount = oldInvoiceAmount.add(invoiceAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
                 break;
             // 工作组项目
             case PayIncomeContractCommon.PROJECT_TYPE2:
                 PayWorkingGroupSubItem workingGroup = payWorkingGroupSubItemMapper.selectById(payMailBillProject.getProjectId());
                 amountReceivable = workingGroup.getReceivableAmount();//应收
                 needInvoice = workingGroup.getNeedInvoice();//是否需要发票
-                invoiceAmount = workingGroup.getInvoiceAmount();//开票金额
+                oldInvoiceAmount = workingGroup.getInvoiceAmount();
+                //之前开票总额+本次开票金额
+                invoiceAmount = oldInvoiceAmount.add(invoiceAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
                 break;
             //会议项目
             case PayIncomeContractCommon.PROJECT_TYPE3:
                 PayMeetingSituation meeting = payMeetingSituationMapper.selectById(payMailBillProject.getProjectId());
                 amountReceivable = meeting.getAmountReceivable();//应收
                 needInvoice = meeting.getNeedInvoice();//是否需要发票
-                invoiceAmount = meeting.getInvoiceAmount();//开票金额
+                oldInvoiceAmount = meeting.getInvoiceAmount();
+                //之前开票总额+本次开票金额
+                invoiceAmount = oldInvoiceAmount.add(invoiceAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
                 break;
             //会员项目
             case PayIncomeContractCommon.PROJECT_TYPE4:
                 PayMemberProjectSubitem memberProject = payMemberProjectSubitemMapper.selectById(payMailBillProject.getProjectId());
                 amountReceivable = memberProject.getAmountReceivable();//应收
                 needInvoice = memberProject.getNeedInvoice();//是否需要发票
-                invoiceAmount = memberProject.getInvoiceAmount();//开票金额
+                oldInvoiceAmount = memberProject.getInvoiceAmount();
+                //之前开票总额+本次开票金额
+                invoiceAmount = oldInvoiceAmount.add(invoiceAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
                 break;
             //标协会员
             case PayIncomeContractCommon.PROJECT_TYPE5:
                 TbMemberProjectSubitem tbMemberProject = tbMemberProjectSubitemMapper.selectById(payMailBillProject.getProjectId());
                 amountReceivable = tbMemberProject.getAmountReceivable();//应收
                 needInvoice = tbMemberProject.getInvoiceRequirements();//是否需要发票
-                invoiceAmount = tbMemberProject.getInvoiceAmount();//开票金额
+                oldInvoiceAmount = tbMemberProject.getInvoiceAmount();
+                //之前开票总额+本次开票金额
+                invoiceAmount = oldInvoiceAmount.add(invoiceAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
                 break;
             default:
                 break;
@@ -354,6 +368,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                 PayCommonProject newCommon = new PayCommonProject();
                 newCommon.setId(payMailBillProject.getProjectId());
                 newCommon.setMakeInvoice(makeInvoice);
+                newCommon.setInvoiceAmount(invoiceAmount);
                 payCommonProjectMapper.updateById(newCommon);
                 break;
             // 工作组项目
@@ -361,6 +376,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                 PayWorkingGroupSubItem newWorkingGroup = new PayWorkingGroupSubItem();
                 newWorkingGroup.setId(payMailBillProject.getProjectId());
                 newWorkingGroup.setMakeInvoice(makeInvoice);
+                newWorkingGroup.setInvoiceAmount(invoiceAmount);
                 payWorkingGroupSubItemMapper.updateById(newWorkingGroup);
                 break;
             //会议项目
@@ -368,6 +384,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                 PayMeetingSituation newMeeting = new PayMeetingSituation();
                 newMeeting.setId(payMailBillProject.getProjectId());
                 newMeeting.setMakeInvoice(makeInvoice);
+                newMeeting.setInvoiceAmount(invoiceAmount);
                 payMeetingSituationMapper.updateById(newMeeting);
                 break;
             //会员项目
@@ -375,6 +392,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                 PayMemberProjectSubitem newMemberProject = new PayMemberProjectSubitem();
                 newMemberProject.setId(payMailBillProject.getProjectId());
                 newMemberProject.setMakeInvoice(makeInvoice);
+                newMemberProject.setInvoiceAmount(invoiceAmount);
                 payMemberProjectSubitemMapper.updateById(newMemberProject);
                 break;
             //标协会员
@@ -382,6 +400,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                 TbMemberProjectSubitem newTbMemberProject = new TbMemberProjectSubitem();
                 newTbMemberProject.setId(payMailBillProject.getProjectId());
                 newTbMemberProject.setMakeInvoice(makeInvoice);
+                newTbMemberProject.setInvoiceAmount(invoiceAmount);
                 tbMemberProjectSubitemMapper.updateById(newTbMemberProject);
 
                 break;