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 | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
index bfeebca..b35247d 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
@@ -18,6 +18,7 @@
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>
@@ -33,34 +34,33 @@
<!-- <if test="delFlag == 0 or delFlag == 1">-->
<!-- and a.del_flag = #{delFlag}-->
<!-- </if>-->
- and a.del_flag = 0
order by
- <if test="record.namePx != null and record.namePx != '' and record.namePx == 1">
+ <if test="namePx != null and namePx != '' and namePx == 1">
a.qg_start_time
</if>
- <if test="record.namePx != null and record.namePx != '' and record.namePx == 2">
+ <if test="namePx != null and namePx != '' and namePx == 2">
a.qg_end_time
</if>
- <if test="record.namePx != null and record.namePx != '' and record.namePx == 3">
+ <if test="namePx != null and namePx != '' and namePx == 3">
a.is_sale
</if>
- <if test="record.namePx != null and record.namePx != '' and record.namePx == 4">
- a.present_price
+ <if test="namePx != null and namePx != '' and namePx == 4">
+ a.present_price + 0
</if>
- <if test="record.namePx != null and record.namePx != '' and record.namePx == 5">
- a.original_price
+ <if test="namePx != null and namePx != '' and namePx == 5">
+ a.original_price + 0
</if>
- <if test="record.namePx != null and record.namePx != '' and record.namePx == 6">
+ <if test="namePx != null and namePx != '' and namePx == 6">
stock
</if>
- <if test="record.namePx != null and record.namePx != '' and record.namePx == 7">
+ <if test="namePx != null and namePx != '' and namePx == 7">
a.CREATED_TIME
</if>
- <if test="record.typePx != null and record.typePx != '' and record.typePx == 1">
+ <if test="typePx != null and typePx != '' and typePx == 1">
asc
</if>
- <if test="record.typePx != null and record.typePx != '' and record.typePx == 2">
+ <if test="typePx != null and typePx != '' and typePx == 2">
desc
</if>
</select>
@@ -105,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}))
@@ -133,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