From cecded0e51d7dfae1a255f0589cbee3338f8a307 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 23 九月 2024 15:52:20 +0800
Subject: [PATCH] 1.合伙人-去掉手机号修改

---
 src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java |   43 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java b/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
index ba34055..3888379 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
@@ -67,6 +67,9 @@
     @Autowired
     private OrderItemCheckMapper orderItemCheckMapper;
 
+    @Autowired
+    private DeliveryOrderService deliveryOrderService;
+
     public String createSales(OrderItemSalesCreateDTO dto){
         Integer num = dto.getNum();
         if(num == null || num == 0){
@@ -158,10 +161,10 @@
     }
 
     public List<OrderStatusCountDTO> getSalesStatusCount(OrderItemSalesQueryDTO dto) {
-        dto.setOrderStartDate(parseLocalDateTime(dto.getOrderStartDateStr()));
-        dto.setOrderEndDate(parseLocalDateTime(dto.getOrderEndDateStr()));
-        dto.setSalesStartDate(parseLocalDateTime(dto.getSalesStartDateStr()));
-        dto.setSalesEndDate(parseLocalDateTime(dto.getSalesEndDateStr()));
+        dto.setOrderStartDate(parseLocalDateTime(dto.getOrderStartDateStr(), true));
+        dto.setOrderEndDate(parseLocalDateTime(dto.getOrderEndDateStr(), false));
+        dto.setSalesStartDate(parseLocalDateTime(dto.getSalesStartDateStr(), true));
+        dto.setSalesEndDate(parseLocalDateTime(dto.getSalesEndDateStr(), false));
 
         List<CodeValueDTO> ls = codeService.searchValue("ORDER_SALES_STATUS");
         List<OrderStatusCountDTO> ll = orderItemSalesMapper.getSalesStatusCount(dto);
@@ -295,6 +298,27 @@
             rr.setStationName(s.getName());
         }
 
+        List<OrderItemCheck> cLs = orderItemCheckMapper.selectList(new QueryWrapper<OrderItemCheck>()
+                .eq("order_item_id", oi.getId())
+                .eq("audit_status", Constants.CHECK_AUDIT_STATUS.AGREED.name())
+        );
+        int reduceNum = 0;
+        BigDecimal reduceAmount = new BigDecimal(0);
+        int replaceNum = 0;
+        if(cLs != null && cLs.size() > 0){
+            for(OrderItemCheck c : cLs){
+                if(Constants.CHECK_TYPE.reduce.name().equals(c.getType())){
+                    reduceNum += c.getNum();
+                    reduceAmount = reduceAmount.add(c.getDeductAmount());
+                } else if(Constants.CHECK_TYPE.replace.name().equals(c.getType())){
+                    replaceNum += c.getNum();
+                }
+            }
+        }
+        rr.setReduceNum(reduceNum);
+        rr.setReduceAmount(reduceAmount);
+        rr.setReplaceNum(replaceNum);
+
         return rr;
     }
 
@@ -313,6 +337,11 @@
         }
 
         BigDecimal feeSupplier = getAmount(dto.getFeeSupplier());
+        BigDecimal supplierTotal = oi.getSupplierPrice().multiply(new BigDecimal(sl.getNum()));
+        if(feeSupplier.doubleValue() > supplierTotal.doubleValue()){
+            throw new ValidationException("供应商扣款金额不能大于商品申请数量的供应商售价");
+        }
+
         BigDecimal feePartner = getAmount(dto.getFeePartner());
         BigDecimal feePlatform = getAmount(dto.getFeePlatform());
         BigDecimal feePlatformPack = getAmount(dto.getFeePlatformPack());
@@ -342,6 +371,12 @@
             throw new ValidationException("退款总金额不能大于商品总价");
         }
 
+        BigDecimal deduct = deliveryOrderService.calculateOrderItemDeduct(sl.getOrderItemId());//质检已扣款金额
+        preFee = preFee.add(deduct);
+        if(preFee.doubleValue() > oi.getRealTotal().doubleValue()){
+            throw new ValidationException("退款总金额(包含质检退款)不能大于商品总价");
+        }
+
         sl.setRemarks(dto.getRemarks());
         sl.setFeeSupplier(feeSupplier);
         sl.setFeePartner(feePartner);

--
Gitblit v1.9.3