Browse Source

修复bug:付款金额问题

别傲 5 years ago
parent
commit
2d9e60fe2f

+ 0 - 18
lift-business-service/src/main/java/cn/com/ty/lift/business/contract/service/ContractService.java

@@ -95,12 +95,6 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
             //应收金额总计
             BigDecimal planMoneyTotal = paymentList.stream().map(Payment::getPlanMoney).reduce(ZERO, BigDecimal::add);
             contracts.setPlanMoneyTotal(planMoneyTotal);
-            //实收金额总计
-            BigDecimal workMoneyTotal = paymentList.stream().map(Payment::getWorkMoney).reduce(ZERO, BigDecimal::add);
-            contracts.setWorkMoneyTotal(workMoneyTotal);
-            //开票金额总计
-            BigDecimal invoiceTotal = paymentList.stream().map(Payment::getAmountInvoice).reduce(ZERO, BigDecimal::add);
-            contracts.setInvoiceMoneyTotal(invoiceTotal);
         }
         //插入合同信息
         boolean result = save(contracts);
@@ -143,12 +137,6 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
             //应收金额总计
             BigDecimal planMoneyTotal = paymentList.stream().map(Payment::getPlanMoney).reduce(ZERO, BigDecimal::add);
             contracts.setPlanMoneyTotal(planMoneyTotal);
-            //实收金额总计
-            BigDecimal workMoneyTotal = paymentList.stream().map(Payment::getWorkMoney).reduce(ZERO, BigDecimal::add);
-            contracts.setWorkMoneyTotal(workMoneyTotal);
-            //开票金额总计
-            BigDecimal invoiceTotal = paymentList.stream().map(Payment::getAmountInvoice).reduce(ZERO, BigDecimal::add);
-            contracts.setInvoiceMoneyTotal(invoiceTotal);
         }
         //插入新合同信息
         boolean result = save(contracts);
@@ -222,12 +210,6 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
         //应收金额总计
         BigDecimal planMoneyTotal = paymentList.stream().map(Payment::getPlanMoney).reduce(ZERO, BigDecimal::add);
         contracts.setPlanMoneyTotal(planMoneyTotal);
-        //实收金额总计
-        BigDecimal workMoneyTotal = paymentList.stream().map(Payment::getWorkMoney).reduce(ZERO, BigDecimal::add);
-        contracts.setWorkMoneyTotal(workMoneyTotal);
-        //开票金额总计
-        BigDecimal invoiceTotal = paymentList.stream().map(Payment::getAmountInvoice).reduce(ZERO, BigDecimal::add);
-        contracts.setInvoiceMoneyTotal(invoiceTotal);
 
         boolean contractResult = updateById(contracts);
         if (!contractResult)

+ 0 - 3
lift-business-service/src/main/java/cn/com/ty/lift/business/contract/service/PaymentService.java

@@ -221,9 +221,6 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
         });
         Contracts contracts = contractService.getOne(contractsId);
         if (Objects.nonNull(contracts)) {
-            //应收金额总计
-            BigDecimal planMoneyTotal = paymentList.stream().map(Payment::getPlanMoney).reduce(ZERO, BigDecimal::add);
-            contracts.setPlanMoneyTotal(planMoneyTotal);
             //实收金额总计
             BigDecimal workMoneyTotal = paymentList.stream().map(Payment::getWorkMoney).reduce(ZERO, BigDecimal::add);
             contracts.setWorkMoneyTotal(workMoneyTotal);