From d397b54e3924c55e80782a80d9f19d616d40ccba Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Jun 2021 16:53:40 +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-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java | 3 +++
gc-shop/src/main/java/com/xzx/gc/shop/dto/XcxGoodsListDto.java | 3 +++
gc-core/src/main/java/com/xzx/gc/entity/JhyInfo.java | 3 +++
4 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/entity/JhyInfo.java b/gc-core/src/main/java/com/xzx/gc/entity/JhyInfo.java
index afff5d5..3984fcb 100644
--- a/gc-core/src/main/java/com/xzx/gc/entity/JhyInfo.java
+++ b/gc-core/src/main/java/com/xzx/gc/entity/JhyInfo.java
@@ -32,11 +32,14 @@
* 是否集物员 1-是 2-否
*/
private String isJhy;
+ public static final String IS_JHY_Y = "1";
+ public static final String IS_JHY_N = "2";
/**
* 审核状态 1-待审核 2-审核通过 3-审核拒绝
*/
private Integer status;
+ public static final Integer CHECK_WAIT = 1;
public static final Integer CHECK_PASS = 2;
public static final Integer CHECK_REFUSE = 3;
}
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 4eed143..ecd5d62 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
@@ -35,4 +35,7 @@
@ApiModelProperty(hidden = true)
private String userId;
+ @ApiModelProperty(value = "排序 1-综合 2-销量 3-价格")
+ private int sort = 1;
+
}
diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
index 9edd117..ba01ed8 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
@@ -59,7 +59,15 @@
</if>
</where>
group by a.id
- order by a.id desc
+ <if test="record.sort == 1">
+ order by a.id desc
+ </if>
+ <if test="record.sort == 2">
+ order by quantity desc
+ </if>
+ <if test="record.sort == 3">
+ order by a.present_price desc
+ </if>
</select>
<resultMap id="goodsDetailsMap" type="com.xzx.gc.shop.vo.XcxGoodsDetailVo">
diff --git a/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java b/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java
index 535a8a5..7d45998 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java
@@ -42,6 +42,9 @@
JhyInfo jhyInfo = new JhyInfo();
BeanUtil.copyProperties(applyDto, jhyInfo);
jhyInfo.setCreatedTime(new Date());
+ jhyInfo.setIsJhy(JhyInfo.IS_JHY_N);
+ jhyInfo.setCardPos(applyDto.getCardPos());
+ jhyInfo.setStatus(JhyInfo.CHECK_WAIT);
jhyInfoMapper.insert(jhyInfo);
}
--
Gitblit v1.9.1