From 004d9e74f66d87e8416a9b0d807b64cbfd1576f8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 15 Dec 2021 15:16:07 +0800
Subject: [PATCH] fix
---
gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
index c75cef2..b35247d 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
@@ -5,19 +5,64 @@
<select id="queryGoodsList" resultType="com.xzx.gc.shop.vo.QueryGoodsListVo">
SELECT
a.*,
- a.CREATED_TIME createTime
+ a.CREATED_TIME createTime,
+ (
+ SELECT
+ ifnull(sum(b.stock),0)
+ FROM
+ xzx_score_goods_sku b
+ WHERE 1 = 1
+ and b.goods_id = a.id
+ ) stock
FROM
xzx_score_goods a
WHERE 1 = 1
+ and a.del_flag = 0
<if test="name != null and name != ''">
and (a.name like concat('%',#{name},'%') or a.goods_no like concat('%',#{name},'%'))
</if>
+
+ <if test="isQg != null and isQg != ''">
+ and a.is_qg= #{isQg}
+ </if>
+
+ <if test="isSale != null and isSale != ''">
+ and a.is_sale= #{isSale}
+ </if>
+
<!-- <if test="delFlag == 0 or delFlag == 1">-->
<!-- and a.del_flag = #{delFlag}-->
<!-- </if>-->
- and a.del_flag = 0
- order by a.CREATED_TIME desc
+ order by
+ <if test="namePx != null and namePx != '' and namePx == 1">
+ a.qg_start_time
+ </if>
+ <if test="namePx != null and namePx != '' and namePx == 2">
+ a.qg_end_time
+ </if>
+ <if test="namePx != null and namePx != '' and namePx == 3">
+ a.is_sale
+ </if>
+ <if test="namePx != null and namePx != '' and namePx == 4">
+ a.present_price + 0
+ </if>
+ <if test="namePx != null and namePx != '' and namePx == 5">
+ a.original_price + 0
+ </if>
+ <if test="namePx != null and namePx != '' and namePx == 6">
+ stock
+ </if>
+ <if test="namePx != null and namePx != '' and namePx == 7">
+ a.CREATED_TIME
+ </if>
+
+ <if test="typePx != null and typePx != '' and typePx == 1">
+ asc
+ </if>
+ <if test="typePx != null and typePx != '' and typePx == 2">
+ desc
+ </if>
</select>
@@ -60,7 +105,7 @@
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()
+ and a.is_qg=#{record.isQg} and a.qg_end_time > now() and a.qg_start_time < now()
</if>
<if test="record.cateId != null and 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}))
@@ -88,6 +133,7 @@
<result property="qgStartTime" column="qg_start_time" />
<result property="qgEndTime" column="qg_end_time" />
<result property="details" column="details" />
+ <result property="quotaTime" column="quota_time" />
<collection property="styles" ofType="com.xzx.gc.shop.vo.XcxGoodsDetailStyleVo" >
<id property="id" column="s_id" />
<result property="name" column="s_name" />
--
Gitblit v1.9.1