From 96dac6da1a20dfa2ecea41544ca21c31c93e7bb2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 30 Jun 2021 14:41:49 +0800
Subject: [PATCH] modify

---
 gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml |   33 ++++++++++++++++++++++++++-------
 1 files changed, 26 insertions(+), 7 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..2937f41 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}-->
@@ -39,23 +40,41 @@
         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}
             </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
-        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">
@@ -95,7 +114,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