From 42471c905b755bf90294b4aa8261eb2ed7f0eac4 Mon Sep 17 00:00:00 2001
From: baozhipeng <961815525@qq.com>
Date: Wed, 15 Sep 2021 19:54:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=BC=80=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/mail/mapper/PayMailBillMapper.java   |  2 -
 .../mail/mapper/PayMailBillProjectMapper.java |  5 +++
 .../mail/mapper/xml/PayMailBillMapper.xml     |  7 ----
 .../mapper/xml/PayMailBillProjectMapper.xml   |  8 +++-
 .../mail/service/IPayMailBillService.java     |  2 +-
 .../service/impl/PayMailBillServiceImpl.java  | 39 +++++++++++++++++--
 .../impl/PayMeetingSituationServiceImpl.java  |  2 +-
 7 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java
index 68bfda20..6910e647 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java
@@ -29,8 +29,6 @@ public interface PayMailBillMapper extends BaseMapper<PayMailBill> {
      */
     List<PayMailBill> selectCommonProjectMailBillVO(@Param("projectId") String projectId);
 
-//    开票总额
-    BigDecimal sumInvoiceAmount(@Param("projectId") String projectId);
 
 
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillProjectMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillProjectMapper.java
index 44f9ed02..f6fb4885 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillProjectMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillProjectMapper.java
@@ -2,6 +2,9 @@ package com.jero.mail.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jero.mail.entity.PayMailBillProject;
+import io.lettuce.core.dynamic.annotation.Param;
+
+import java.math.BigDecimal;
 
 /**
  * @Description: pay_mail_bill_project
@@ -11,4 +14,6 @@ import com.jero.mail.entity.PayMailBillProject;
  */
 public interface PayMailBillProjectMapper extends BaseMapper<PayMailBillProject> {
 
+    //    开票总额
+    BigDecimal sumInvoiceAmount(@Param("projectId") String projectId);
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
index 66630768..166d80f4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
@@ -42,12 +42,5 @@
         WHERE pmb.id IN (SELECT bill_id FROM pay_mail_bill_project WHERE project_id=#{projectId})
     </select>
 
-<!--    开票总额-->
-    <select id="sumInvoiceAmount" resultType="Decimal">
-        select sum(b.invoice_amount)
-        from pay_mail_bill b
-                 left join pay_mail_bill_project bp	on b.id = bp.bill_id
-        where bp.project_id= #{projectId}
-    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillProjectMapper.xml
index 38d35073..b75235fa 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillProjectMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillProjectMapper.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.demo.mailBill.mapper.PayMailBillProjectMapper">
+<mapper namespace="com.jero.mail.mapper.PayMailBillProjectMapper">
 
+    <!--    开票总额-->
+    <select id="sumInvoiceAmount" resultType="Decimal">
+        select sum(invoice_amount)
+        from pay_mail_bill_project
+        where project_id= #{projectId}
+    </select>
 </mapper>
\ No newline at end of file
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 78bc02b5..5999bb93 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
@@ -33,7 +33,7 @@ public interface IPayMailBillService extends IService<PayMailBill> {
      * @param payMailBill
      * @return
      */
-    Result<?> addPayBill(PayMailBill payMailBill,String projectIds,String projectTypes);
+    Result<?> addPayBill(PayMailBill payMailBill,String projectIds,String projectTypes,String invoiceAmounts);
 
 
 
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 177038a1..64449cbb 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
@@ -15,6 +15,7 @@ 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;
 import com.jero.mail.service.IPayMailBillService;
 import com.jero.meeting.entity.PayMeetingSituation;
@@ -71,6 +72,8 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
     private TbMemberProjectSubitemMapper tbMemberProjectSubitemMapper;
     @Resource
     private PayMailBillMapper payMailBillMapper;
+    @Resource
+    private PayMailBillProjectMapper payMailBillProjectMapper;
 
     @Override
     public List<PayMailBill> selectMailBillVO(String projectId) {
@@ -96,13 +99,14 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
      * @param payMailBill
      * @return
      */
-    public Result<?> addPayBill(PayMailBill payMailBill, String projectIds, String projectTypes) {
+    public Result<?> addPayBill(PayMailBill payMailBill, String projectIds, String projectTypes,String invoiceAmounts) {
 
         String[] projectIdArray = projectIds.split(",");
         String[] projectTypeArray = projectTypes.split(",");
+        String[] invoiceAmountArrays = invoiceAmounts.split(",");
 
         //校验不同项目是否属于同一个公司
-        String res = checkCompanyProject(projectIdArray, projectTypeArray);
+        String res = checkCompanyProject(projectIdArray, projectTypeArray,invoiceAmountArrays);
         if (!"success".equals(res)) {
             return Result.error(res);
         }
@@ -120,6 +124,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     throw new JeroBootException("标协会员项目，只能开票一次。");
                 }
             }
+
         }
 
         //新增票据邮寄表
@@ -131,6 +136,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
             payMailBillProject.setBillId(payMailBill.getId());
             payMailBillProject.setProjectId(projectIdArray[i]);
             payMailBillProject.setProjectType(Integer.valueOf(projectTypeArray[i]));
+            payMailBillProject.setInvoiceAmount(new BigDecimal(invoiceAmountArrays[i]));
             payMailBillProjectService.save(payMailBillProject);
 
 //            更新项目表开票状态
@@ -141,11 +147,16 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
 
 
     //校验不同项目是否属于同一个公司
-    private String checkCompanyProject(String[] projectIdArray, String[] projectTypeArray) {
+    private String checkCompanyProject(String[] projectIdArray, String[] projectTypeArray,String[] invoiceAmountArrays) {
         String standardCompanyId = null;//基准公司id
 
         for (int i = 0; i < projectTypeArray.length; i++) {
 
+            //之前开票总额
+            BigDecimal oldInvoiceAmount = payMailBillProjectMapper.sumInvoiceAmount(projectIdArray[i]);
+            //加上本次开票金额
+            BigDecimal invoiceAmount = oldInvoiceAmount.add(new BigDecimal(invoiceAmountArrays[i])).setScale(2, BigDecimal.ROUND_HALF_UP);
+
             switch (projectTypeArray[i]) {
 
                 // 普通项目
@@ -158,6 +169,10 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     if (!standardCompanyId.equals(payCommonProject.getChargeCompanyId())) {
                         return "打包开票只能是同一个企业";
                     }
+                    //开票总额>应收
+                    if(invoiceAmount.compareTo(payCommonProject.getReceivableAmount()) == 1){
+                        return "开票金额大于当前欠未开票金额，输入有误！";
+                    }
                     break;
                 // 工作组项目
                 case PayIncomeContractCommon.PROJECT_TYPE2:
@@ -169,6 +184,10 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     if (!standardCompanyId.equals(workingGroup.getChargeCompanyId())) {
                         return "打包开票只能是同一个企业";
                     }
+                    //开票总额>应收
+                    if(invoiceAmount.compareTo(workingGroup.getReceivableAmount()) == 1){
+                        return "开票金额大于当前欠未开票金额，输入有误！";
+                    }
                     break;
                 //会议项目
                 case PayIncomeContractCommon.PROJECT_TYPE3:
@@ -180,6 +199,10 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     if (!standardCompanyId.equals(meeting.getCompanyId())) {
                         return "打包开票只能是同一个企业";
                     }
+                    //开票总额>应收
+                    if(invoiceAmount.compareTo(meeting.getAmountReceivable()) == 1){
+                        return "开票金额大于当前欠未开票金额，输入有误！";
+                    }
                     break;
                 //会员项目
                 case PayIncomeContractCommon.PROJECT_TYPE4:
@@ -191,6 +214,10 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     if (!standardCompanyId.equals(memberProject.getCompanyId())) {
                         return "打包开票只能是同一个企业";
                     }
+                    //开票总额>应收
+                    if(invoiceAmount.compareTo(memberProject.getAmountReceivable()) == 1){
+                        return "开票金额大于当前欠未开票金额，输入有误！";
+                    }
                     break;
                 //标协会员
                 case PayIncomeContractCommon.PROJECT_TYPE5:
@@ -202,6 +229,10 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     if (!standardCompanyId.equals(tbMemberProject.getCompanyId())) {
                         return "打包开票只能是同一个企业";
                     }
+                    //开票总额>应收
+                    if(invoiceAmount.compareTo(tbMemberProject.getAmountReceivable()) == 1){
+                        return "开票金额大于当前欠未开票金额，输入有误！";
+                    }
                     break;
                 default:
                     break;
@@ -256,7 +287,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                 break;
         }
 //        开票总额
-        BigDecimal invoiceAmount = payMailBillMapper.sumInvoiceAmount(projectId);
+        BigDecimal invoiceAmount = payMailBillProjectMapper.sumInvoiceAmount(projectId);
         if(invoiceAmount==null){
             invoiceAmount =new BigDecimal("0");
         }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index 360a6f82..aecefd20 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -231,7 +231,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         payMailBill.setBillDate(new Date());
         payMailBill.setProjectName(payMeeting.getMeetingName());
         payMailBill.setChargeCompanyName(payMeetingSituation.getCompanyName());
-        payMailBillService.addPayBill(payMailBill, projectIds.toString(), PayIncomeContractCommon.PROJECT_TYPE3);
+        payMailBillService.addPayBill(payMailBill, projectIds.toString(), PayIncomeContractCommon.PROJECT_TYPE3,allAmount.toString());
     }
 
     /**