From c210fee4e5f6750f9923bb9877b3290f401295d2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Jun 2021 17:19:33 +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 | 10 ++++++++--
gc-shop/src/main/java/com/xzx/gc/shop/dto/XcxGoodsListDto.java | 5 ++++-
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/dto/XcxGoodsListDto.java b/gc-shop/src/main/java/com/xzx/gc/shop/dto/XcxGoodsListDto.java
index ecd5d62..aa9e0d1 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/dto/XcxGoodsListDto.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/dto/XcxGoodsListDto.java
@@ -18,7 +18,10 @@
private String name;
@ApiModelProperty(value = "积分")
- private String score;
+ private Integer minScore;
+
+ @ApiModelProperty(value = "积分")
+ private Integer maxScore;
@ApiModelProperty(value = "分类ID")
private Long cateId;
diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
index 6a1ef3c..10496b2 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
@@ -41,11 +41,17 @@
a.*,
sum(b.quantity) quantity,
sum(b.stock) stock,
- max(b.present_price) maxPrice
+ min(b.present_price) minPrice
from xzx_score_goods a
inner join xzx_score_goods_sku b on a.id=b.goods_id and b.del_flag=0
<where>
a.del_flag=0 and a.is_sale=1
+ <if test="record.minScore != null" >
+ and b.present_price >= #{minScore}
+ </if>
+ <if test="record.maxScore != null">
+ and #{record.maxScore} > b.present_price
+ </if>
<if test="record.name != null and record.name != ''">
and a.name like concat('%',#{record.name},'%')
</if>
@@ -67,7 +73,7 @@
order by quantity desc
</if>
<if test="record.sort == 3">
- order by maxPrice desc
+ order by minPrice desc
</if>
</select>
--
Gitblit v1.9.1