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 | 12 ++++++++++--
1 files changed, 10 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 ba01ed8..c75cef2 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
@@ -8,6 +8,7 @@
a.CREATED_TIME createTime
FROM
xzx_score_goods a
+
WHERE 1 = 1
<if test="name != null and name != ''">
and (a.name like concat('%',#{name},'%') or a.goods_no like concat('%',#{name},'%'))
@@ -40,11 +41,18 @@
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('%',#{record.name},'%')
</if>
@@ -66,7 +74,7 @@
order by quantity desc
</if>
<if test="record.sort == 3">
- order by a.present_price desc
+ order by minPrice desc
</if>
</select>
--
Gitblit v1.9.1