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 ++++--
src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java | 6 ++++++
src/main/resources/mapper/payment/OrderItemSalesMapper.xml | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java
index 0a30d16..406528e 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java
@@ -101,4 +101,10 @@
@DictTrans(target = "salesTypeStr", codeType = "after_sale_type")
private String salesType;
private String salesTypeStr;
+
+ @ApiModelProperty(value = "真实成交价格/每扎")
+ private BigDecimal realPrice;
+
+ @ApiModelProperty(value = "真实成交总价格")
+ private BigDecimal realTotal;
}
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("退款总金额不能大于商品总价");
}
diff --git a/src/main/resources/mapper/payment/OrderItemSalesMapper.xml b/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
index eef9518..6abf279 100644
--- a/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
+++ b/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
@@ -71,7 +71,7 @@
, oi.flower_level, oi.flower_category, o.customer, o.customer_tel, o.customer_province, o.customer_city
, o.customer_region, o.customer_address, oi.num flowerNum, oi.supplier_name, oi.price, oi.total
, o.order_no, si.sales_no, si.title, si.num, si.reason, si.total_fee, si.status, si.create_time
- , si.remarks, oi.supplier_price, oi.markup_partner, si.audit_time,si.sales_type
+ , si.remarks, oi.supplier_price, oi.markup_partner, si.audit_time,si.sales_type, oi.real_price, oi.real_total
FROM t_order_item_sales si
join t_order_item oi on oi.id = si.order_item_id
join t_order o on si.order_id = o.id
--
Gitblit v1.9.3