fix:第二版财务,修复应付款汇总,应收款汇总问题

chenhang4442024
1 parent e5d3ac96
Showing 7 changed files with 175 additions and 17 deletions
src/main/java/com/order/erp/domain/dto/order/OrderBaseInfoDO.java
src/main/java/com/order/erp/domain/vo/order/OrderBaseInfoQueryVO.java
src/main/java/com/order/erp/service/order/impl/InvoiceBillOrderServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
src/main/java/com/order/erp/service/order/impl/ProducePaymentCheckBillOrderServiceImpl.java
src/main/resources/mapper/InvoiceBillOrderMapper.xml
@@ -129,5 +129,14 @@ public class OrderBaseInfoDO extends BaseDO implements Serializable {
      * 生产科对账单号
      */
     private String checkNo;
+    //invoice状态和checkstatus状态。
+    /**
+     * invoice状态
+     */
+    private Integer invoiceStatus;
+    /**
+     * 生产科对账单号状态
+     */
+    private Integer checkStatus;
 }
@@ -197,5 +197,13 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable {
      * checkNo   首页筛选Check。
      */
     private List<String> CheckNo;
+    /**
+     * invoice   invoice状态。
+     */
+    private Long invoiceStatus;
+    /**
+     * checkNo   checkNo状态。
+     */
+    private Long checkNoStatus;
 }
@@ -512,7 +512,58 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
   //第一版,上面为第二版 Map<Long, InvoiceBillMappingDO> orderBillMap = invoiceBillMappingDOS.stream().collect(Collectors.toMap(InvoiceBillMappingDO::getOrderId, Function.identity(), (x, y) -> x));
         List<InvoiceOrderBaseItemVO> itemVOS = getInvoiceOrderBaseItems(invoiceBillOrderDOMap);
 //第一版,上面为第二版   List<InvoiceOrderBaseItemVO> itemVOS = getInvoiceOrderBaseItems(orderBillMap);
-        Map<String, InvoiceBillOrderDO> invoiceBillMap = invoiceBillOrderDOS.stream().collect(Collectors.toMap(InvoiceBillOrderDO::getInvoiceNo, Function.identity(), (x, y) -> x));
+        //这里出问题了。
+//        Map<String, InvoiceBillOrderDO> invoiceBillMap = invoiceBillOrderDOS.stream().collect(Collectors.toMap(InvoiceBillOrderDO::getInvoiceNo, Function.identity(), (x, y) -> x));
+      /*  Map<String, InvoiceBillOrderDO> invoiceBillMap = invoiceBillOrderDOS.stream()
+                .collect(Collectors.toMap(
+                        InvoiceBillOrderDO::getInvoiceNo,  // 按 invoiceNo 作为键
+                        Function.identity(),               // 值是当前对象
+                        (x, y) -> {
+                            // 在这里进行属性累加
+                            x.setDeductAmount(x.getDeductAmount().add(y.getDeductAmount()));
+                            x.setOtherAmount(x.getOtherAmount().add(y.getOtherAmount()));
+                            x.setActualPayedAmount1(x.getActualPayedAmount1().add(y.getActualPayedAmount1()));
+                            x.setActualPayedAmount2(x.getActualPayedAmount2().add(y.getActualPayedAmount2()));
+                            x.setActualPayedAmount3(x.getActualPayedAmount3().add(y.getActualPayedAmount3()));
+                            x.setTotalCustomerAmount(x.getTotalCustomerAmount().add(y.getTotalCustomerAmount()));
+                            // 可以根据需要累加更多属性
+                            return x; // 返回累加后的对象
+                        }
+                ));*/
+        Map<String, InvoiceBillOrderDO> invoiceBillMap = invoiceBillOrderDOS.stream()
+                .collect(Collectors.toMap(
+                        InvoiceBillOrderDO::getInvoiceNo,  // 按 invoiceNo 作为键
+                        Function.identity(),               // 值是当前对象
+                        (x, y) -> {
+                            // 在这里进行属性累加，确保避免空指针异常
+                            x.setDeductAmount(
+                                    Optional.ofNullable(x.getDeductAmount()).orElse(BigDecimal.ZERO)
+                                            .add(Optional.ofNullable(y.getDeductAmount()).orElse(BigDecimal.ZERO))
+                            );
+                            x.setOtherAmount(
+                                    Optional.ofNullable(x.getOtherAmount()).orElse(BigDecimal.ZERO)
+                                            .add(Optional.ofNullable(y.getOtherAmount()).orElse(BigDecimal.ZERO))
+                            );
+                            x.setActualPayedAmount1(
+                                    Optional.ofNullable(x.getActualPayedAmount1()).orElse(BigDecimal.ZERO)
+                                            .add(Optional.ofNullable(y.getActualPayedAmount1()).orElse(BigDecimal.ZERO))
+                            );
+                            x.setActualPayedAmount2(
+                                    Optional.ofNullable(x.getActualPayedAmount2()).orElse(BigDecimal.ZERO)
+                                            .add(Optional.ofNullable(y.getActualPayedAmount2()).orElse(BigDecimal.ZERO))
+                            );
+                            x.setActualPayedAmount3(
+                                    Optional.ofNullable(x.getActualPayedAmount3()).orElse(BigDecimal.ZERO)
+                                            .add(Optional.ofNullable(y.getActualPayedAmount3()).orElse(BigDecimal.ZERO))
+                            );
+                            x.setTotalCustomerAmount(
+                                    Optional.ofNullable(x.getTotalCustomerAmount()).orElse(BigDecimal.ZERO)
+                                            .add(Optional.ofNullable(y.getTotalCustomerAmount()).orElse(BigDecimal.ZERO))
+                            );
+                            // 可以根据需要累加更多属性
+                            return x; // 返回累加后的对象
+                        }
+                ));
         Map<String, List<InvoiceOrderBaseItemVO>> baseItemMap = itemVOS.stream().collect(Collectors.groupingBy(InvoiceOrderBaseItemVO::getInvoiceCode));
         List<InvoiceBillAnalysisExportVO> exportVOS = wrapperAnalysisExport(invoiceBillMap, baseItemMap);
         return wrapperAnalysisResultVO(exportVOS);
@@ -804,7 +855,9 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         List<InvoiceBillOrderDO> invoiceBillOrderDOList = buildInvoiceBillOrderDO(createVO,orderBaseInfoDOList);
         List<OrderBaseInfoDO> containInvoiceOrderBaseInfoList=orderBaseInfoDOList.stream().map(x->{
+            //是否删除invocie?没必要!       设置invocieStatus状态。
             x.setInvoiceNo(createVO.getInvoiceNo());
+            x.setInvoiceStatus(FinanceEnum.UNPAID_PAYMENTS.getStatus());
             return  x;
         }).collect(Collectors.toList());
@@ -1500,6 +1500,8 @@ end
                 .in(CollectionUtils.isNotEmpty(queryVO.getOrderIds()), OrderBaseInfoDO::getId, queryVO.getOrderIds())
                 .in(CollectionUtils.isNotEmpty(queryVO.getInvoiceNo()),OrderBaseInfoDO::getInvoiceNo,queryVO.getInvoiceNo())
                 .in(CollectionUtils.isNotEmpty(queryVO.getCheckNo()),OrderBaseInfoDO::getCheckNo,queryVO.getCheckNo())
+                .eq(Objects.nonNull(queryVO.getInvoiceStatus()), OrderBaseInfoDO::getInvoiceStatus, queryVO.getInvoiceStatus())
+                .eq(Objects.nonNull(queryVO.getCheckNoStatus()), OrderBaseInfoDO::getCheckStatus, queryVO.getCheckNoStatus())
                 .orderByDesc(OrderBaseInfoDO::getId)
                 ;
     }
@@ -15,6 +15,7 @@ import com.order.erp.common.constant.ServerResult;
 import com.order.erp.common.constant.ServerResultCode;
 import com.order.erp.common.exception.BusinessException;
 import com.order.erp.common.utils.OrderFieldUtils;
+import com.order.erp.common.utils.TransactionHelper;
 import com.order.erp.config.DataScope;
 import com.order.erp.domain.*;
 import com.order.erp.domain.dto.BaseDO;
@@ -74,9 +75,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
     @Resource
     private ProducePaymentCheckBillOrderService checkBillOrderService;
     @Resource
-    private InvoiceBillMappingService invoiceBillMappingService;
-    @Resource
-    private CheckBillMappingService checkBillMappingService;
+    private TransactionHelper transactionHelper;
     /**
      * 通过ID查询单条数据
@@ -201,11 +200,11 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                         }//这里结束  上述为待审核列表中应收款要显示内部编码。*/   //这部分不需要了。
                         //这部分的目的是,对于跟单员和业务员他们也能查看到应收款和应付款中各自负责订单的审核情况。 而财务和admin则会执行else{},会看到所有的审核订单信息。
                         if(RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode())){
-                            if(Objects.nonNull(orderLockFieldVO.getCheckBillOrderDO()) && orderLockFieldVO.getCheckBillOrderDO().getBusinesPerson().equals(loginUserName)){
+                            if(Objects.nonNull(orderLockFieldVO.getProducePaymentCheckBillFieldVO()) && orderLockFieldVO.getProducePaymentCheckBillFieldVO().getBusinesPerson().equals(loginUserName)){
                                 resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
                             }
                         } else if (RoleEnum.TRACKER_USER.getCode().equals(roleEnum.getCode())) {
-                            if(Objects.nonNull(orderLockFieldVO.getCheckBillOrderDO()) && orderLockFieldVO.getCheckBillOrderDO().getTrackerUser().equals(loginUserName)){
+                            if(Objects.nonNull(orderLockFieldVO.getProducePaymentCheckBillFieldVO()) && orderLockFieldVO.getProducePaymentCheckBillFieldVO().getTrackerUser().equals(loginUserName)){
                                 resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
                             }
                         } else{
@@ -445,7 +444,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                     );
                 }
             }else{
-                if(Objects.nonNull(queryVO.getType()) && queryVO.getType().equals(ApplyTypeEnum.CHECK_BILL_APPLY.getType())){
+                if(Objects.nonNull(queryVO.getType()) && queryVO.getType().equals(ApplyTypeEnum.INVOICE_BILL_APPLY.getType())){
                     queryWrapper.eq(Objects.nonNull(queryVO.getType()), OrderFieldLockApplyDO::getType, queryVO.getType());
                     //这个内部编号单独针对于应付款申请设置的。
                     if(CollectionUtils.isNotEmpty(queryVO.getInnerNo())){
@@ -581,7 +580,20 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                     x.setStatus(FinanceEnum.UNPAID_PAYMENTS.getStatus());
                     return x;
                 }).collect(Collectors.toList());
-                invoiceBillOrderService.updateBatchById(invoiceBillOrderDOS);
+                //写这里
+                List<Long> orderIdList = invoiceBillOrderDOS.stream()
+                        .filter(Objects::nonNull)
+                        .map(InvoiceBillOrderDO::getOrderId)
+                        .collect(Collectors.toList());
+                List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIdList);
+                List<OrderBaseInfoDO> orderBaseInfoDOS = orderBaseInfoDOList.stream().filter(Objects::nonNull).map(x -> {
+                    x.setInvoiceStatus(FinanceEnum.UNPAID_PAYMENTS.getStatus());
+                    return x;
+                }).collect(Collectors.toList());
+                transactionHelper.run(() -> {
+                    orderBaseInfoService.updateBatchById(orderBaseInfoDOS);
+                    invoiceBillOrderService.updateBatchById(invoiceBillOrderDOS);
+                });
             }
         } else if (ApplyTypeEnum.CHECK_BILL_APPLY.getType().equals(applyDO.getType())) {
             OrderLockFieldVO lockFieldVO = JSONObject.parseObject(applyDO.getFields(), OrderLockFieldVO.class);
@@ -593,7 +605,19 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                     x.setStatus(FinanceEnum.UNPAID_PAYMENTS.getStatus());
                     return x;
                 }).collect(Collectors.toList());
-                checkBillOrderService.updateBatchById(producePaymentCheckBillOrderDOS);
+                List<Long> orderIdList = producePaymentCheckBillOrderDOS.stream()
+                        .filter(Objects::nonNull)
+                        .map(ProducePaymentCheckBillOrderDO::getOrderId)
+                        .collect(Collectors.toList());
+                List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIdList);
+                List<OrderBaseInfoDO> orderBaseInfoDOS = orderBaseInfoDOList.stream().filter(Objects::nonNull).map(x -> {
+                    x.setCheckStatus(FinanceEnum.UNPAID_PAYMENTS.getStatus());
+                    return x;
+                }).collect(Collectors.toList());
+                transactionHelper.run(() -> {
+                    orderBaseInfoService.updateBatchById(orderBaseInfoDOS);
+                    checkBillOrderService.updateBatchById(producePaymentCheckBillOrderDOS);
+                });
             }
         } else if(ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(applyDO.getType())){
@@ -752,7 +776,19 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                     x.setStatus(FinanceEnum.RECEIVED_PAYMENT.getStatus());
                     return x;
                 }).collect(Collectors.toList());
-                invoiceBillOrderService.updateBatchById(invoiceeBillOrderDOs);
+                List<Long> orderIdList = invoiceBillOrderDOS.stream()
+                        .filter(Objects::nonNull)
+                        .map(InvoiceBillOrderDO::getOrderId)
+                        .collect(Collectors.toList());
+                List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIdList);
+                List<OrderBaseInfoDO> orderBaseInfoDOS = orderBaseInfoDOList.stream().filter(Objects::nonNull).map(x -> {
+                    x.setInvoiceStatus(FinanceEnum.RECEIVED_PAYMENT.getStatus());
+                    return x;
+                }).collect(Collectors.toList());
+                transactionHelper.run(() -> {
+                    orderBaseInfoService.updateBatchById(orderBaseInfoDOS);
+                    invoiceBillOrderService.updateBatchById(invoiceeBillOrderDOs);
+                });
             }
         } else if (ApplyTypeEnum.CHECK_BILL_APPLY.getType().equals(applyDO.getType())) {
             applyDO.setAuditUserId(auditUserId);
@@ -766,7 +802,19 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                     x.setStatus(FinanceEnum.RECEIVED_PAYMENT.getStatus());
                     return x;
                 }).collect(Collectors.toList());
-                checkBillOrderService.updateBatchById(producePaymentCheckBillOrderDOS);
+                List<Long> orderIdList = checkBillOrderDOS.stream()
+                        .filter(Objects::nonNull)
+                        .map(ProducePaymentCheckBillOrderDO::getOrderId)
+                        .collect(Collectors.toList());
+                List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIdList);
+                List<OrderBaseInfoDO> orderBaseInfoDOS = orderBaseInfoDOList.stream().filter(Objects::nonNull).map(x -> {
+                    x.setCheckStatus(FinanceEnum.RECEIVED_PAYMENT.getStatus());
+                    return x;
+                }).collect(Collectors.toList());
+                transactionHelper.run(() ->{
+                    orderBaseInfoService.updateBatchById(orderBaseInfoDOS);
+                    checkBillOrderService.updateBatchById(producePaymentCheckBillOrderDOS);
+                });
             }
         }  else if (ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(applyDO.getType())) {
             applyDO.setAuditUserId(auditUserId);
@@ -171,8 +171,43 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         }*/
             Map<Long, ProducePaymentCheckBillOrderDO> orderBillMap = checkBillOrderDOS.stream().collect(Collectors.toMap(ProducePaymentCheckBillOrderDO::getOrderId, Function.identity(), (x, y) -> x));
 //            Map<Long, CheckBillMappingDO> orderBillMap = checkBillMappingDOS.stream().collect(Collectors.toMap(CheckBillMappingDO::getOrderId, Function.identity(), (x, y) -> x));
+
         List<CheckOrderBaseItemVO> itemVOS = getCheckOrderBaseItems(orderBillMap);
-        Map<String, ProducePaymentCheckBillOrderDO> checkBillOrderDOMap = checkBillOrderDOS.stream().collect(Collectors.toMap(ProducePaymentCheckBillOrderDO::getCheckNo, Function.identity(), (x, y) -> x));
+//        Map<String, ProducePaymentCheckBillOrderDO> checkBillOrderDOMap = checkBillOrderDOS.stream().collect(Collectors.toMap(ProducePaymentCheckBillOrderDO::getCheckNo, Function.identity(), (x, y) -> x));
+            Map<String, ProducePaymentCheckBillOrderDO> checkBillOrderDOMap = checkBillOrderDOS.stream()
+                    .collect(Collectors.toMap(
+                            ProducePaymentCheckBillOrderDO::getCheckNo,  // 按 invoiceNo 作为键
+                            Function.identity(),               // 值是当前对象
+                            (x, y) -> {
+                                // 在这里进行属性累加，确保避免空指针异常
+                                x.setDeductAmount(
+                                        Optional.ofNullable(x.getDeductAmount()).orElse(BigDecimal.ZERO)
+                                                .add(Optional.ofNullable(y.getDeductAmount()).orElse(BigDecimal.ZERO))
+                                );
+                                x.setActualPayedAmount1(
+                                        Optional.ofNullable(x.getActualPayedAmount1()).orElse(BigDecimal.ZERO)
+                                                .add(Optional.ofNullable(y.getActualPayedAmount1()).orElse(BigDecimal.ZERO))
+                                );
+                                x.setActualPayedAmount2(
+                                        Optional.ofNullable(x.getActualPayedAmount2()).orElse(BigDecimal.ZERO)
+                                                .add(Optional.ofNullable(y.getActualPayedAmount2()).orElse(BigDecimal.ZERO))
+                                );
+                                x.setActualPayedAmount3(
+                                        Optional.ofNullable(x.getActualPayedAmount3()).orElse(BigDecimal.ZERO)
+                                                .add(Optional.ofNullable(y.getActualPayedAmount3()).orElse(BigDecimal.ZERO))
+                                );
+                                x.setTotalProductionAmount(
+                                        Optional.ofNullable(x.getTotalProductionAmount()).orElse(BigDecimal.ZERO)
+                                                .add(Optional.ofNullable(y.getTotalProductionAmount()).orElse(BigDecimal.ZERO))
+                                );
+                                x.setTotalActualPayedAmount(
+                                        Optional.ofNullable(x.getTotalActualPayedAmount()).orElse(BigDecimal.ZERO)
+                                                .add(Optional.ofNullable(y.getTotalActualPayedAmount()).orElse(BigDecimal.ZERO))
+                                );
+                                // 可以根据需要累加更多属性
+                                return x; // 返回累加后的对象
+                            }
+                    ));
         Map<String, List<CheckOrderBaseItemVO>> baseItemMap = itemVOS.stream().collect(Collectors.groupingBy(CheckOrderBaseItemVO::getCheckNo));
         List<CheckBillAnalysisExportVO> exportVOS = wrapperAnalysisExport(checkBillOrderDOMap, baseItemMap);
         return wrapperAnalysisResultVO(exportVOS);
@@ -280,7 +315,8 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         CheckBillAnalysisExportVO exportVO = new CheckBillAnalysisExportVO();
         BeanUtils.copyProperties(checkBillOrderDO, exportVO);
         // 应付
-        BigDecimal actualPayedAmount = Objects.nonNull(checkBillOrderDO.getActualPayedAmount()) ? checkBillOrderDO.getActualPayedAmount() : new BigDecimal(Constant.ZERO);
+//        BigDecimal actualPayedAmount = Objects.nonNull(checkBillOrderDO.getActualPayedAmount()) ? checkBillOrderDO.getActualPayedAmount() : new BigDecimal(Constant.ZERO);
+        BigDecimal actualPayedAmount = (Objects.nonNull(checkBillOrderDO.getTotalProductionAmount()) ? checkBillOrderDO.getTotalProductionAmount() : new BigDecimal(Constant.ZERO));
         BigDecimal deductAmount = Objects.nonNull(checkBillOrderDO.getDeductAmount()) ? checkBillOrderDO.getDeductAmount() : new BigDecimal(Constant.ZERO);
         BigDecimal totalActualPayedAmount = Objects.nonNull(checkBillOrderDO.getTotalActualPayedAmount()) ? checkBillOrderDO.getTotalActualPayedAmount() : new BigDecimal(Constant.ZERO);
         //   返回    实付
@@ -289,9 +325,9 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         //第二版 可删  应付减去实付
         BigDecimal calculateActualPayedAmount = actualPayedAmount.subtract(totalActualPayedAmount);
         //返回应付
-        exportVO.setCalculateActualPayedAmount(actualPayedAmount.setScale(2, RoundingMode.HALF_UP));
+        exportVO.setCalculateActualPayedAmount((actualPayedAmount.subtract(deductAmount)).setScale(2, RoundingMode.HALF_UP));
         // 返回未付
-        exportVO.setUnPayedAmount(calculateActualPayedAmount.setScale(2, RoundingMode.HALF_UP));
+        exportVO.setUnPayedAmount((exportVO.getCalculateActualPayedAmount().subtract(exportVO.getActualPayedAmount())).setScale(2, RoundingMode.HALF_UP));
         //保留小数点后两位。
        exportVO.setDeductAmount(exportVO.getDeductAmount().setScale(2, RoundingMode.HALF_UP));
         return exportVO;
@@ -544,7 +580,9 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         List<ProducePaymentCheckBillOrderDO> checkBillOrderDOList = buildCheckBillOrderDO(createVO,orderBaseInfoDOList);
         List<OrderBaseInfoDO> containCheckOrderBaseInfoList = orderBaseInfoDOList.stream().map(x -> {
+            //是否删除check?没必要！   设置checkStatus状态。
             x.setCheckNo(createVO.getCheckNo());
+            x.setCheckStatus(FinanceEnum.UNPAID_PAYMENTS.getStatus());
             return x;
         }).collect(Collectors.toList());
@@ -128,10 +128,10 @@
             AND p.check_no = #{queryVO.checkNo}
         </if>
         <if test="queryVO.invoiceStatus != null">
-            AND i.status = #{queryVO.invoiceStatus}
+            AND o.invoice_status = #{queryVO.invoiceStatus}
         </if>
         <if test="queryVO.checkNoStatus != null">
-            AND p.status = #{queryVO.checkNoStatus}
+            AND o.check_status = #{queryVO.checkNoStatus}
         </if>
         <if test="queryVO.customerCode != null and queryVO.customerCode != ''">
             AND o.customer_code = #{queryVO.customerCode}