From fefa68e08d3d2e97f57a583c5df5883231641f75 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Jun 2021 18:26:39 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
index 2eb9cab..bf590e6 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
@@ -4,7 +4,8 @@
<select id="queryGoodsList" resultType="com.xzx.gc.shop.vo.QueryGoodsListVo">
SELECT
- *
+ a.*,
+ a.CREATED_TIME createTime
FROM
xzx_score_goods a
WHERE 1 = 1
@@ -50,8 +51,11 @@
<if test="record.id != null and record.id != ''">
and a.id=#{record.id}
</if>
+ <if test="record.isQg != null and record.isQg != ''">
+ and a.is_qg=#{record.isQg} and a.qg_end_time > now()
+ </if>
<if test="record.cateId != null and record.cateId != ''">
- and (a.category_id = #{record.cateId} or a.category in (select id from xzx_score_goods_category where parent_id=#{record.cateId}))
+ and (a.category_id = #{record.cateId} or a.category_id in (select id from xzx_score_goods_category where parent_id=#{record.cateId}))
</if>
</where>
group by a.id
--
Gitblit v1.9.1