From 357f148f73eed2b25da6ecd13bc3e632c07d4c11 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Jun 2021 16:07:17 +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 | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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..9edd117 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
@@ -4,12 +4,13 @@
<select id="queryGoodsList" resultType="com.xzx.gc.shop.vo.QueryGoodsListVo">
SELECT
- *
+ a.*,
+ a.CREATED_TIME createTime
FROM
xzx_score_goods a
WHERE 1 = 1
<if test="name != null and name != ''">
- and a.name like concat('%',#{name},'%')
+ and (a.name like concat('%',#{name},'%') or a.goods_no like concat('%',#{name},'%'))
</if>
<!-- <if test="delFlag == 0 or delFlag == 1">-->
<!-- and a.del_flag = #{delFlag}-->
@@ -45,13 +46,16 @@
<where>
a.del_flag=0 and a.is_sale=1
<if test="record.name != null and record.name != ''">
- and a.name like CONCAT(CONCAT(#{record.name}, "%"), "%")
+ and a.name like concat('%',#{record.name},'%')
</if>
<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
@@ -95,7 +99,7 @@
c.quantity sku_quantity
from xzx_score_goods a
inner join xzx_score_goods_style b on a.id = b.goods_id and b.del_flag = 0
- inner join xzx_score_goods_sku c on a.id = c.goods_id and c.del_flag = 0
+ inner join xzx_score_goods_sku c on b.id = c.style_id and c.del_flag = 0
where a.id=#{id}
</select>
</mapper>
--
Gitblit v1.9.1