From 62d15798697cc6afdb02a0e0a893baadb9e66044 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期四, 29 八月 2024 21:24:25 +0800
Subject: [PATCH] Merge branch 'master' into master-v2
---
src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 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 2a89ef7..944ca71 100644
--- a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
@@ -591,17 +591,19 @@
throw new ValidationException("处理数量不能大于商品数量");
}
- if(deductAmount != null && deductAmount.doubleValue() > oi.getTotal().doubleValue()){
- throw new ValidationException("降级金额不能大于商品总金额");
- }
-
- BigDecimal deduct = deductAmount;
- if(deduct == null){
- 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()));
+ 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()));
+ } else if (Constants.CHECK_TYPE.reduce.name().equals(dto.getType())) {
+ if(deductAmount == null){
+ throw new ValidationException("降级金额不能为空");
+ }
+ deduct = deductAmount.multiply(new BigDecimal(dto.getNum()));
+ BigDecimal dt = oi.getPrice().multiply(new BigDecimal(dto.getNum()));
+ if(deduct.doubleValue() > dt.doubleValue()){
+ throw new ValidationException("降级金额不能大于商品处理数量金额");
}
}
@@ -638,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)
@@ -669,6 +671,8 @@
deliveryOrderMapper.updateById(d);
}
}
+
+ return oi.getOrderId();
}
public void deleteCheckInfo(String itemId, String type){
--
Gitblit v1.9.3