From 4525d92eb8cfec5f2cd43a96862328ae6cbdf386 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 25 Jun 2021 18:27:23 +0800 Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop --- gc-core/src/main/resources/application.properties | 2 +- gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml | 4 ++-- gc-shop/src/main/java/com/xzx/gc/shop/vo/XcxGoodsListVo.java | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gc-core/src/main/resources/application.properties b/gc-core/src/main/resources/application.properties index b09f250..832738b 100644 --- a/gc-core/src/main/resources/application.properties +++ b/gc-core/src/main/resources/application.properties @@ -11,7 +11,7 @@ #log -project.log.path=xzx/logs +project.log.path=/xzx/logs logstash.server.url=localhost:4560 #spring diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/XcxGoodsListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/XcxGoodsListVo.java index 1424123..ea8fce1 100644 --- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/XcxGoodsListVo.java +++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/XcxGoodsListVo.java @@ -28,4 +28,7 @@ @ApiModelProperty(value = "库存") private Integer stock; + + @ApiModelProperty(value = "是否抢购 1-是 2-否") + private Integer isQg; } diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml index 45b4654..4e1ffc3 100644 --- a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml +++ b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml @@ -52,10 +52,10 @@ and a.id=#{record.id} </if> <if test="record.isQg != null and record.isQg != ''"> - and a.is_qg=#{record.isQg} and now() > a.qg_end_time + 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