From 9005cfeca43a3f661fe67158753d5c7febdac15b Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期三, 28 八月 2024 20:46:04 +0800
Subject: [PATCH] 结算 bug
---
src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 74354c9..1e503f0 100644
--- a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
@@ -585,10 +585,7 @@
if(dto.getNum() == null || dto.getNum() == 0){
throw new ValidationException("处理数量不能为0");
}
- OrderItemCheck c = orderItemCheckMapper.selectOne(new QueryWrapper<OrderItemCheck>()
- .eq("type", dto.getType())
- .eq("order_item_id", dto.getOrderItemId())
- );
+
OrderItem oi = orderItemMapper.selectById(dto.getOrderItemId());
if(dto.getNum() > oi.getNum()){
throw new ValidationException("处理数量不能大于商品数量");
@@ -602,7 +599,15 @@
deduct = oi.getPrice().multiply(new BigDecimal(dto.getNum()));
}
}
+
+ OrderItemCheck c = orderItemCheckMapper.selectOne(new QueryWrapper<OrderItemCheck>()
+ .eq("type", dto.getType())
+ .eq("order_item_id", dto.getOrderItemId())
+ );
if(c != null){
+ if(StringUtils.isNotEmpty(c.getAuditStatus())){
+ throw new ValidationException("已审核，不可修改");
+ }
c.setCheckTime(LocalDateTime.now());
c.setNum(dto.getNum());
c.setRemarks(dto.getRemarks());
--
Gitblit v1.9.3