From 20d1feece65044058f54a9b8621755a2cf051740 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 08 Nov 2021 17:19:07 +0800
Subject: [PATCH] 20211108
---
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml | 4 +
gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java | 2
gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml | 49 +++++++++++++++
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 28 ++++++++-
gc-core/src/main/java/com/xzx/gc/entity/ScoreGoods.java | 1
gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryGoodsListDto.java | 13 ++++
gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderMapper.java | 3 +
gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml | 1
gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java | 5 +
gc-shop/src/main/java/com/xzx/gc/shop/mapper/ScoreGoodsMapper.java | 4 +
gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java | 18 +++--
11 files changed, 113 insertions(+), 15 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/entity/ScoreGoods.java b/gc-core/src/main/java/com/xzx/gc/entity/ScoreGoods.java
index ba6f0f7..a20de61 100644
--- a/gc-core/src/main/java/com/xzx/gc/entity/ScoreGoods.java
+++ b/gc-core/src/main/java/com/xzx/gc/entity/ScoreGoods.java
@@ -52,6 +52,7 @@
private Date qgEndTime;
private Integer isSale;
+ private Integer quotaTime;
public static final Integer ISSALE_YES = 1;
public static final Integer ISSALE_NO = 2;
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryGoodsListDto.java b/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryGoodsListDto.java
index 9e812c1..adfcf18 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryGoodsListDto.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryGoodsListDto.java
@@ -12,6 +12,19 @@
private String name;
@ApiModelProperty(value="是否已删除 0：未删除 1:已删除 2全部")
private Integer delFlag;
+
+ @ApiModelProperty(value="是否抢购 1/是 2/否")
+ private Integer isQg;
+
+ @ApiModelProperty(value="是否上架 1/是 2/否")
+ private Integer isSale;
+
+ @ApiModelProperty(value="排序字段 1：抢购开始时间 2：抢购结束时间 3:是否上架 4:现价 5:原价 6:库存 7：创建时间")
+ private Integer namePx;
+
+ @ApiModelProperty(value="排序方式 1： asc , 2 ：desc")
+ private Integer typePx;
+
@ApiModelProperty(value="第几页",required=true)
private int page;
@ApiModelProperty(value="每一页数量",required=true)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderMapper.java b/gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderMapper.java
index c96f082..0afa4bd 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderMapper.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderMapper.java
@@ -1,5 +1,6 @@
package com.xzx.gc.shop.mapper;
+import com.xzx.gc.entity.AddressInfo;
import com.xzx.gc.entity.JhyInfo;
import com.xzx.gc.entity.JhyOrder;
import com.xzx.gc.shop.dto.QueryJhyOrderListDto;
@@ -26,4 +27,6 @@
BigDecimal selectTotalScoreHasGet(@Param("userId") String userId);
JhyInfo selectJhyInfoByUserId(@Param("jhyId")Long jhyId);
+
+ List<AddressInfo> selectAddRessInfoByUserId(@Param("userId")Long userId);
}
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/mapper/ScoreGoodsMapper.java b/gc-shop/src/main/java/com/xzx/gc/shop/mapper/ScoreGoodsMapper.java
index 25d623a..fb411c2 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/mapper/ScoreGoodsMapper.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/mapper/ScoreGoodsMapper.java
@@ -18,7 +18,9 @@
ScoreGoods selectById(long id);
- List<QueryGoodsListVo> queryGoodsList(@Param("name")String name, @Param("delFlag")int delFlag);
+ List<QueryGoodsListVo> queryGoodsList(@Param("name")String name, @Param("delFlag")int delFlag
+ , @Param("isQg")int isQg, @Param("isSale")int isSale
+ , @Param("namePx")int namePx, @Param("typePx")int typePx);
List<XcxGoodsListVo> selectXcxGoodsList(@Param("record") XcxGoodsListDto xcxGoodsListDto);
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
index 133dc5b..69b6199 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
@@ -103,16 +103,18 @@
public Map<String, Object> queryGoodsList(QueryGoodsListDto model) {
String name = model.getName() == null ? "":model.getName();
int delFlag = model.getDelFlag() == null ? 2:model.getDelFlag();
+ int namePx = model.getNamePx() == null ? 7:model.getNamePx();
+ int typePx = model.getTypePx() == null ? 2:model.getTypePx();
PageHelper.startPage(model.getPage(), model.getLimit());
- List<QueryGoodsListVo> maps = scoreGoodsMapper.queryGoodsList(name,delFlag);
- if(CollUtil.isNotEmpty(maps)){
- for(QueryGoodsListVo queryGoodsListVo : maps){
- long id = queryGoodsListVo.getId();
- Integer stock = scoreGoodsSkuMapper.selectScoreGoodsSkuMapperByGoodId(id);
- queryGoodsListVo.setStock(stock);
- }
- }
+ List<QueryGoodsListVo> maps = scoreGoodsMapper.queryGoodsList(name,delFlag,model.getIsQg(),model.getIsSale(),namePx,typePx);
+// if(CollUtil.isNotEmpty(maps)){
+// for(QueryGoodsListVo queryGoodsListVo : maps){
+// long id = queryGoodsListVo.getId();
+// Integer stock = scoreGoodsSkuMapper.selectScoreGoodsSkuMapperByGoodId(id);
+// queryGoodsListVo.setStock(stock);
+// }
+// }
PageInfo pageInfo = new PageInfo(maps);
int count = Convert.toInt(pageInfo.getTotal());
Map<String, Object> map = new HashMap<>();
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
index 3cd814c..cdabb62 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
@@ -6,16 +6,15 @@
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import com.rabbitmq.client.Address;
+import com.xzx.gc.common.constant.Constants;
import com.xzx.gc.common.exception.RestException;
import com.xzx.gc.common.utils.StringUtils;
import com.xzx.gc.entity.*;
import com.xzx.gc.shop.dto.AssignJhyOrderDto;
import com.xzx.gc.shop.dto.CancelJhyOrderDto;
import com.xzx.gc.shop.dto.QueryJhyOrderListDto;
-import com.xzx.gc.shop.mapper.JhyOrderItemsMapper;
-import com.xzx.gc.shop.mapper.JhyOrderMapper;
-import com.xzx.gc.shop.mapper.OrderInfoMapper;
-import com.xzx.gc.shop.mapper.ScoreOrderMapper;
+import com.xzx.gc.shop.mapper.*;
import com.xzx.gc.shop.vo.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -70,6 +69,27 @@
Long id = queryJhyOrderListVo.getId();
List<JhyOrderItemsVo> jhyOrderItemsVos = jhyOrderItemsMapper.selectByOrderId(id);
queryJhyOrderListVo.setJhyOrderItemsVos(jhyOrderItemsVos);
+
+ String orderAddr = queryJhyOrderListVo.getArea() + queryJhyOrderListVo.getAddress();
+ Long userId = queryJhyOrderListVo.getUserId();
+ List<AddressInfo> addressInfos = jhyOrderMapper.selectAddRessInfoByUserId(userId);
+ if(CollUtil.isNotEmpty(addressInfos)){
+ for(AddressInfo addressInfo : addressInfos){
+ StringBuffer address = new StringBuffer();
+ address.append(addressInfo.getDetailAddress());
+ if (StrUtil.isNotBlank(addressInfo.getTagName())) {
+ address.append(StrUtil.isNotBlank(addressInfo.getHouseName()) ? addressInfo.getHouseName() : "");
+ if (Constants.ADDRESS_TYPE_HOME.equals(addressInfo.getTagName())) {
+ address.append(StrUtil.isNotBlank(addressInfo.getHouseNumber()) ? addressInfo.getHouseNumber() : "");
+ address.append(StrUtil.isNotBlank(addressInfo.getUnitName()) ? addressInfo.getUnitName() : "");
+ }
+ }
+ if (orderAddr.equals(addressInfo.getAddressArea() + address)) {
+ queryJhyOrderListVo.setUnitName(addressInfo.getUnitName());
+ queryJhyOrderListVo.setHouseNumber(addressInfo.getHouseNumber());
+ }
+ }
+ }
}
}
// if(CollUtil.isNotEmpty(maps)){
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java
index bb8660d..0e29a3d 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java
@@ -12,6 +12,7 @@
public class QueryJhyOrderListVo {
private Long id;
+ private Long userId;
@ApiModelProperty(value="订单号")
private String orderNo;
@ApiModelProperty(value="联系人")
@@ -24,6 +25,10 @@
private String area;
@ApiModelProperty(value="详细地址")
private String address;
+ @ApiModelProperty(value="单元栋")
+ private String unitName;
+ @ApiModelProperty(value="楼门牌号")
+ private String houseNumber;
@ApiModelProperty(value="预约年月日")
private String reserveDate;
@ApiModelProperty(value="预约时间")
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java
index bd49c0b..a4161b7 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java
@@ -34,4 +34,6 @@
private String expressCom;
@ApiModelProperty(value="物流单号")
private String expressNo;
+ @ApiModelProperty(value="收货地址")
+ private String expressAddress;
}
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index a626a11..9fb109c 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -120,4 +120,8 @@
<select id="selectJhyInfoByUserId" resultType="com.xzx.gc.entity.JhyInfo">
select * from xzx_jhy_info where id = #{jhyId}
</select>
+
+ <select id="selectAddRessInfoByUserId" resultType="com.xzx.gc.entity.AddressInfo">
+ select * from xzx_user_address_info where user_id = #{userId}
+ </select>
</mapper>
diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
index c75cef2..bfeebca 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
@@ -5,7 +5,15 @@
<select id="queryGoodsList" resultType="com.xzx.gc.shop.vo.QueryGoodsListVo">
SELECT
a.*,
- a.CREATED_TIME createTime
+ a.CREATED_TIME createTime,
+ (
+ SELECT
+ ifnull(sum(b.stock),0)
+ FROM
+ xzx_score_goods_sku b
+ WHERE 1 = 1
+ and b.goods_id = a.id
+ ) stock
FROM
xzx_score_goods a
@@ -13,11 +21,48 @@
<if test="name != null and name != ''">
and (a.name like concat('%',#{name},'%') or a.goods_no like concat('%',#{name},'%'))
</if>
+
+ <if test="isQg != null and isQg != ''">
+ and a.is_qg= #{isQg}
+ </if>
+
+ <if test="isSale != null and isSale != ''">
+ and a.is_sale= #{isSale}
+ </if>
+
<!-- <if test="delFlag == 0 or delFlag == 1">-->
<!-- and a.del_flag = #{delFlag}-->
<!-- </if>-->
and a.del_flag = 0
- order by a.CREATED_TIME desc
+ order by
+ <if test="record.namePx != null and record.namePx != '' and record.namePx == 1">
+ a.qg_start_time
+ </if>
+ <if test="record.namePx != null and record.namePx != '' and record.namePx == 2">
+ a.qg_end_time
+ </if>
+ <if test="record.namePx != null and record.namePx != '' and record.namePx == 3">
+ a.is_sale
+ </if>
+ <if test="record.namePx != null and record.namePx != '' and record.namePx == 4">
+ a.present_price
+ </if>
+ <if test="record.namePx != null and record.namePx != '' and record.namePx == 5">
+ a.original_price
+ </if>
+ <if test="record.namePx != null and record.namePx != '' and record.namePx == 6">
+ stock
+ </if>
+ <if test="record.namePx != null and record.namePx != '' and record.namePx == 7">
+ a.CREATED_TIME
+ </if>
+
+ <if test="record.typePx != null and record.typePx != '' and record.typePx == 1">
+ asc
+ </if>
+ <if test="record.typePx != null and record.typePx != '' and record.typePx == 2">
+ desc
+ </if>
</select>
diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
index 41526d6..e76a47d 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
@@ -10,6 +10,7 @@
b.nick_name name,
b.mobile_phone phone,
d.express_com expressCom,
+ d.address expressAddress,
d.express_no expressNo
FROM
xzx_score_order a
--
Gitblit v1.9.1