From 34c21f1c938ba3659c5d50201a0e64f747ee4545 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 24 八月 2024 09:48:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
index 1e5f04f..905b3ba 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
@@ -93,6 +93,7 @@
case 1:
for (int i = 0; i < split.length-1; i++) {
Integer reduce = tShoppingOrderService.list(new QueryWrapper<TShoppingOrder>()
+ .eq("order_type",1)
.eq("goods_id", split[i])
.eq("payment_status", 2)
.ne("refund_status", 2))
@@ -103,6 +104,8 @@
case 2:
for (int i = 0; i < split.length-1; i++) {
Integer reduce = exchangeOrderService.list(new QueryWrapper<TExchangeOrder>()
+ .eq("order_type",1)
+ .ne("status",4)
.eq("goods_id", split[i])
)
.stream().map(TExchangeOrder::getPurchaseQuantity).reduce(0, Integer::sum);
--
Gitblit v1.7.1