From c4bade94a970fca41493ec5a8e02a91219248a57 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 01 Dec 2021 10:47:47 +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 | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
index 76638ae..b35247d 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
@@ -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}))
--
Gitblit v1.9.1