From 81af9b7cb0473c1c27cd397d9b1799885972dd6b Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期四, 13 六月 2024 18:09:49 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionSalesroomMapper.xml | 7 +++++--
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java | 6 ++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java
index 928405a..9987afb 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java
@@ -75,4 +75,10 @@
* 秒杀活动商品key前缀
*/
public static final String SECKILL_GOODS = "seckill_goods:";
+ /**
+ * 订单延时任务-自动关闭","超时订单自动关闭
+ */
+
+ public static final String ORDER_AUTOMATIC_CANCEL = "oroer_automatic_cancel:";
+
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionSalesroomMapper.xml b/ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionSalesroomMapper.xml
index 857b4f7..4b6ec3a 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionSalesroomMapper.xml
+++ b/ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionSalesroomMapper.xml
@@ -19,14 +19,17 @@
<select id="pageMemberAuctionSalesroomWdList" resultType="com.ruoyi.system.api.domain.AuctionSalesroom">
SELECT * FROM t_auction_salesroom ta
WHERE ta.del_flag = 0
- <if test="param.status!=null and param.status != ''">
+ <if test="param.status!=null and param.salesroomName != 5">
AND ta.status=#{param.status}
+ </if>
+ <if test="param.salesroomName == 5">
+ AND ta.status=0
</if>
<if test="param.salesroomName!=null and param.salesroomName != ''">
AND ta.salesroom_name LIKE CONCAT('%',#{param.salesroomName},'%')
</if>
<if test="param.goodsSkuIdList != null and param.goodsSkuIdList.size()>0">
- OR ta.id IN
+ AND ta.id IN
<foreach collection="param.goodsSkuIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
--
Gitblit v1.7.1