From 8495247c638d9b201eedfaf09bbf38e0fecda87d Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 30 八月 2024 09:53:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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..944ca71 100644
--- a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
@@ -601,8 +601,9 @@
throw new ValidationException("降级金额不能为空");
}
deduct = deductAmount.multiply(new BigDecimal(dto.getNum()));
- if(deduct.doubleValue() > oi.getTotal().doubleValue()){
- throw new ValidationException("降级金额不能大于商品总金额");
+ BigDecimal dt = oi.getPrice().multiply(new BigDecimal(dto.getNum()));
+ if(deduct.doubleValue() > dt.doubleValue()){
+ throw new ValidationException("降级金额不能大于商品处理数量金额");
}
}
@@ -639,7 +640,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 +671,8 @@
deliveryOrderMapper.updateById(d);
}
}
+
+ return oi.getOrderId();
}
public void deleteCheckInfo(String itemId, String type){
--
Gitblit v1.9.3