From 18a3d6e87e6682a19b421155cb168416dd73b349 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期六, 21 九月 2024 22:55:58 +0800
Subject: [PATCH] 1.优惠券文件描述修改，“订单金额不能小于折扣金额”修改成“优惠券使用条件不能小于面值金额”
---
src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 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 3a8cc6e..ba34055 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
@@ -64,6 +64,9 @@
@Autowired
private CodeDecorator codeDecorator;
+ @Autowired
+ private OrderItemCheckMapper orderItemCheckMapper;
+
public String createSales(OrderItemSalesCreateDTO dto){
Integer num = dto.getNum();
if(num == null || num == 0){
@@ -75,7 +78,16 @@
throw new ValidationException("订单商品不存在");
}
- if(num > oi.getNum()){
+ OrderItemCheck c = orderItemCheckMapper.selectOne(new QueryWrapper<OrderItemCheck>()
+ .eq("order_item_id", oi.getId())
+ .eq("type", Constants.CHECK_TYPE.lack.name())
+ .eq("audit_status", Constants.CHECK_AUDIT_STATUS.AGREED.name())
+ );
+ int totalNum = oi.getNum();
+ if(c != null){//需要减去缺货的数量
+ totalNum -= c.getNum();
+ }
+ if(num > totalNum){
throw new ValidationException("申请数量不能超过总数");
}
@@ -88,7 +100,9 @@
String userId = SecurityUtils.getUserId();
int count = orderItemSalesMapper.selectCount(new QueryWrapper<OrderItemSales>()
- .eq("order_item_id", oi.getId()));
+ .eq("order_item_id", oi.getId())
+ .eq("status", Constants.ORDER_SALES_STATUS.AGREED.name())
+ );
if(count >= 2){
throw new ValidationException("售后申请超过限额");
}
@@ -115,6 +129,7 @@
s.setReason(dto.getReason());
s.setStatus(Constants.ORDER_SALES_STATUS.PENDING.name());
s.create(userId);
+ s.setSalesType(dto.getSalesType());
orderItemSalesMapper.insert(s);
return s.getId();
@@ -271,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) {
@@ -305,6 +322,11 @@
BigDecimal totalFee = feeSupplier.add(feePartner).add(feePlatform).add(feePlatformPack)
.add(feePlatformCheck).add(feePlatformTransport);
+ BigDecimal st = oi.getRealPrice().multiply(new BigDecimal(sl.getNum()));//申请售后的花的金额，使用券后的单价
+ if(totalFee.doubleValue() > st.doubleValue()){
+ throw new ValidationException("退款金额不能大于商品申请数量的售价");
+ }
+
List<OrderItemSales> ls = orderItemSalesMapper.selectList(new QueryWrapper<OrderItemSales>()
.eq("order_item_id", oi.getId())
.eq("status", Constants.ORDER_SALES_STATUS.AGREED.name())
@@ -316,8 +338,8 @@
}
}
preFee = preFee.add(totalFee);
- if(preFee.doubleValue() > oi.getTotal().doubleValue()){
- throw new ValidationException("退款金额不能大于商品总价");
+ if(preFee.doubleValue() > oi.getRealTotal().doubleValue()){//使用券后的总价
+ throw new ValidationException("退款总金额不能大于商品总价");
}
sl.setRemarks(dto.getRemarks());
@@ -343,9 +365,5 @@
orderItemSalesMapper.updateById(sl);
return oi;
- }
-
- private BigDecimal getAmount(BigDecimal amount){
- return amount == null ? new BigDecimal(0) : amount;
}
}
--
Gitblit v1.9.3