From 3bcae65deb665be36618f0987f42b88329c23068 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 17 六月 2024 15:06:41 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderReturnRequestMapper.xml | 4 ++--
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderTypeEnum.java | 7 +++++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderTypeEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderTypeEnum.java
index b292a54..e9cedf7 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderTypeEnum.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderTypeEnum.java
@@ -36,4 +36,11 @@
return null;
}
+ public static boolean isMallOrder(OrderTypeEnum type) {
+ return type.getCode() == MALL_ODER.getCode();
+ }
+
+ public static boolean isAuctionOrder(OrderTypeEnum type) {
+ return type.getCode() == AUCTION_ORDER.getCode();
+ }
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderReturnRequestMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderReturnRequestMapper.xml
index aa9e394..4ffe743 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderReturnRequestMapper.xml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderReturnRequestMapper.xml
@@ -36,11 +36,11 @@
AND torr.status = #{query.status}
</if>
<if
- test="query.orderType != null and @com.test.constant.OrderTypeEnum@isMallOrder(query.orderType)">
+ test="query.orderType != null and @com.ruoyi.common.core.enums.OrderTypeEnum@isMallOrder(query.orderType)">
AND o.order_from in (1,2,3)
</if>
<if
- test="query.orderType != null and @com.test.constant.OrderTypeEnum@isAuctionOrder(query.orderType)">
+ test="query.orderType != null and @com.ruoyi.common.core.enums.OrderTypeEnum@isAuctionOrder(query.orderType)">
AND o.order_from = 4
</if>
</where>
--
Gitblit v1.7.1