From 32b4f1698970ff646811766f7d91a555e7d6a850 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期二, 10 九月 2024 07:07:15 +0800
Subject: [PATCH] 质检异常问题
---
src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 8cce311..4f67bd0 100644
--- a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
@@ -609,16 +609,17 @@
}
BigDecimal deduct = new BigDecimal(0);
+ BigDecimal realPrice = oi.getRealPrice()==null?new BigDecimal(0):oi.getRealPrice();
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.getRealPrice().multiply(new BigDecimal(dto.getNum()));
+ deduct = realPrice.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.getRealPrice().multiply(new BigDecimal(dto.getNum()));
+ BigDecimal dt = realPrice.multiply(new BigDecimal(dto.getNum()));
if(deduct.doubleValue() > dt.doubleValue()){
throw new ValidationException("降级金额不能大于商品处理数量金额");
}
--
Gitblit v1.9.3