From 00a8e2f76d02cfc17ca9ff156aa97f85bae5897d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 09 Aug 2021 16:50:55 +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 | 26 +++++++++++++++++++++-----
1 files changed, 21 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 bf590e6..c75cef2 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
@@ -8,9 +8,10 @@
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}-->
@@ -40,13 +41,20 @@
select
a.*,
sum(b.quantity) quantity,
- sum(b.stock) stock
+ sum(b.stock) stock,
+ min(b.present_price) minPrice
from xzx_score_goods a
inner join xzx_score_goods_sku b on a.id=b.goods_id and b.del_flag=0
<where>
a.del_flag=0 and a.is_sale=1
+ <if test="record.minScore != null" >
+ and b.present_price >= #{record.minScore}
+ </if>
+ <if test="record.maxScore != null">
+ and #{record.maxScore} > b.present_price
+ </if>
<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}
@@ -59,7 +67,15 @@
</if>
</where>
group by a.id
- order by a.id desc
+ <if test="record.sort == 1">
+ order by a.id desc
+ </if>
+ <if test="record.sort == 2">
+ order by quantity desc
+ </if>
+ <if test="record.sort == 3">
+ order by minPrice desc
+ </if>
</select>
<resultMap id="goodsDetailsMap" type="com.xzx.gc.shop.vo.XcxGoodsDetailVo">
@@ -99,7 +115,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