From 924b61b5cf80768e1b31e75ded89527d89a3419a Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期六, 21 九月 2024 22:06:56 +0800
Subject: [PATCH] 售后审核 券后单价和总价
---
src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java b/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
index a11cdf9..ba34055 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
@@ -286,6 +286,8 @@
rr.setTotal(oi.getTotal());
rr.setSupplierPrice(oi.getSupplierPrice());
rr.setMarkupPartner(oi.getMarkupPartner());
+ rr.setRealPrice(oi.getRealPrice());
+ rr.setRealTotal(oi.getRealTotal());
Long stationId = oi.getStationId();
if(stationId != null) {
@@ -320,7 +322,7 @@
BigDecimal totalFee = feeSupplier.add(feePartner).add(feePlatform).add(feePlatformPack)
.add(feePlatformCheck).add(feePlatformTransport);
- BigDecimal st = oi.getPrice().multiply(new BigDecimal(sl.getNum()));//申请售后的花的金额
+ BigDecimal st = oi.getRealPrice().multiply(new BigDecimal(sl.getNum()));//申请售后的花的金额，使用券后的单价
if(totalFee.doubleValue() > st.doubleValue()){
throw new ValidationException("退款金额不能大于商品申请数量的售价");
}
@@ -336,7 +338,7 @@
}
}
preFee = preFee.add(totalFee);
- if(preFee.doubleValue() > oi.getTotal().doubleValue()){
+ if(preFee.doubleValue() > oi.getRealTotal().doubleValue()){//使用券后的总价
throw new ValidationException("退款总金额不能大于商品总价");
}
--
Gitblit v1.9.3