From 76310c8da2f8b562fc01b8513ca5c3eb76fda4cc Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期六, 14 九月 2024 13:49:57 +0800
Subject: [PATCH] 订单商品 优惠券退款精度调整
---
src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 bbe6730..70688b3 100644
--- a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
@@ -663,13 +663,19 @@
deduct = oi.getSupplierPrice().multiply(new BigDecimal(dto.getNum()));
} else if(Constants.CHECK_TYPE.lack.name().equals(dto.getType())){
deduct = realPrice.multiply(new BigDecimal(dto.getNum()));
+ //质检退款，按照这个单价扣，如果3扎都缺货，按照总的金额退
+ //缺货数量等于商品总数时按真实总价退款
+ if(dto.getNum().intValue() == oi.getNum() && oi.getRealTotal() != null){
+ deduct = oi.getRealTotal();
+ }
} 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 = realPrice.multiply(new BigDecimal(dto.getNum()));
- if(deduct.doubleValue() > dt.doubleValue()){
+ if(deduct.doubleValue() > dt.doubleValue()
+ || (oi.getRealTotal() != null && deduct.doubleValue() > oi.getRealTotal().doubleValue())){
throw new ValidationException("降级金额不能大于商品处理数量金额");
}
}
--
Gitblit v1.9.3