From a768dc3daa04d35fedfbe75c0a59b9b2545b85c4 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 19 九月 2024 16:59:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2'
---
src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 e7f77e7..a11cdf9 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("申请数量不能超过总数");
}
--
Gitblit v1.9.3