From 49726442d0bad78c9211b7ea13d688c03b916ff6 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 03 九月 2024 17:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
index 41ad60b..5971386 100644
--- a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
@@ -591,18 +591,33 @@
             throw new ValidationException("处理数量不能大于商品数量");
         }
 
+        List<OrderItemCheck> cLs = orderItemCheckMapper.selectList(new QueryWrapper<OrderItemCheck>()
+                .ne("type", dto.getType())
+                .eq("order_item_id", dto.getOrderItemId())
+        );
+        int otherNum = 0;
+        if(cLs != null && cLs.size() > 0){
+            for(OrderItemCheck c : cLs){
+                otherNum += c.getNum();
+            }
+        }
+        if(otherNum + dto.getNum() > oi.getNum()){
+            throw new ValidationException("处理总数量不能大于商品数量");
+        }
+
         BigDecimal deduct = new BigDecimal(0);
         if(Constants.CHECK_TYPE.replace.name().equals(dto.getType())){
             deduct = oi.getSupplierPrice().multiply(new BigDecimal(dto.getNum()));
         } else if(Constants.CHECK_TYPE.lack.name().equals(dto.getType())){
-            deduct = oi.getPrice().multiply(new BigDecimal(dto.getNum()));
+            deduct = oi.getRealPrice().multiply(new BigDecimal(dto.getNum()));
         } else if (Constants.CHECK_TYPE.reduce.name().equals(dto.getType())) {
             if(deductAmount == null){
                 throw new ValidationException("降级金额不能为空");
             }
             deduct = deductAmount.multiply(new BigDecimal(dto.getNum()));
-            if(deduct.doubleValue() > oi.getTotal().doubleValue()){
-                throw new ValidationException("降级金额不能大于商品总金额");
+            BigDecimal dt = oi.getRealPrice().multiply(new BigDecimal(dto.getNum()));
+            if(deduct.doubleValue() > dt.doubleValue()){
+                throw new ValidationException("降级金额不能大于商品处理数量金额");
             }
         }
 
@@ -639,7 +654,7 @@
         }
     }
 
-    public void checkOrderItemStatus(String id){
+    public String checkOrderItemStatus(String id){
         OrderItem oi = orderItemMapper.selectById(id);
         List<OrderItemCheck> cLs = orderItemCheckMapper.selectList(new QueryWrapper<OrderItemCheck>()
                 .eq("order_item_id", id)
@@ -670,6 +685,8 @@
                 deliveryOrderMapper.updateById(d);
             }
         }
+
+        return oi.getOrderId();
     }
 
     public void deleteCheckInfo(String itemId, String type){

--
Gitblit v1.9.3