From cedf9aab0ee975b04c52c0a75749e1eba852db2c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Jun 2021 17:44:21 +0800
Subject: [PATCH] add orderList

---
 gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml |   10 +++++++---
 1 files changed, 7 insertions(+), 3 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..4e1ffc3 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}-->
@@ -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