From 6e34d77e0f49c901bf57286f6507246aafe8b2f4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 25 Jun 2021 11:13:10 +0800
Subject: [PATCH] 20210625 商品分类
---
gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java | 2 +-
gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml | 3 ++-
gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsCategoryListVo.java | 4 ++--
gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsListVo.java | 12 ++++++------
gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryOrderListDto.java | 2 +-
gc-shop/src/main/resources/mapper/shop/ScoreGoodsCategoryMapper.xml | 9 ++++++---
gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml | 8 ++++----
gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewOrderVo.java | 2 +-
gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java | 1 +
gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewGoodsVo.java | 2 +-
10 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryOrderListDto.java b/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryOrderListDto.java
index d29ab50..24cbe1f 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryOrderListDto.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryOrderListDto.java
@@ -15,7 +15,7 @@
@ApiModelProperty(value="客户姓名")
private String name;
- @ApiModelProperty(value="状态 2-待收货3-已完成4-已取消")
+ @ApiModelProperty(value="状态 1-待发货2-待收货3-已收货4-已完成5-已评价6-已取消")
private Integer status;
@JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
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 cb0ee15..4e2213d 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
@@ -184,6 +184,7 @@
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
viewGoodsVo = objectMapper.convertValue(scoreGoods, ViewGoodsVo.class);
+ viewGoodsVo.setCreateTime(scoreGoods.getCreatedTime());
//轮播图
List<String> goodsImages = scoreGoodsImagesMapper.selectScoreGoodsImagesByGoodsId(id);
viewGoodsVo.setGoodsImages(goodsImages);
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsCategoryListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsCategoryListVo.java
index b82208c..b53b1d0 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsCategoryListVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsCategoryListVo.java
@@ -21,9 +21,9 @@
private Long parentId;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value="创建时间")
- private Date createdTime;
+ private String createTime;
@ApiModelProperty(value="创建人")
private String createdBy;
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsListVo.java
index 5696fa7..b495177 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsListVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsListVo.java
@@ -46,12 +46,12 @@
private Integer isQg;
@ApiModelProperty(value="抢购开始时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date qgStartTime;
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String qgStartTime;
@ApiModelProperty(value="抢购结束时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date qgEndTime;
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String qgEndTime;
@ApiModelProperty(value="是否上架 1/是 2/否")
private Integer isSale;
@@ -66,6 +66,6 @@
private short delFlag;
@ApiModelProperty(value="创建时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createdTime;
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String createTime;
}
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 feeb063..27e710f 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
@@ -15,7 +15,7 @@
@ApiModelProperty(value="客户手机号")
private String phone;
@ApiModelProperty(value="下单时间")
- private String createdTime;
+ private String createTime;
@ApiModelProperty(value="订单总价")
private String totalPrice;
@ApiModelProperty(value="数量")
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewGoodsVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewGoodsVo.java
index c8f1608..980a775 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewGoodsVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewGoodsVo.java
@@ -79,5 +79,5 @@
@ApiModelProperty(value="创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createdTime;
+ private Date createTime;
}
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewOrderVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewOrderVo.java
index 076d0b7..c5f117e 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewOrderVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewOrderVo.java
@@ -33,7 +33,7 @@
/**
* 2-待收货3-已完成4-已取消
*/
- @ApiModelProperty(value="状态 2-待收货3-已完成4-已取消")
+ @ApiModelProperty(value="状态 1-待发货2-待收货3-已收货4-已完成5-已评价6-已取消")
private Integer status;
@ApiModelProperty(value="备注")
diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsCategoryMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsCategoryMapper.xml
index 100a7f7..367fe12 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsCategoryMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsCategoryMapper.xml
@@ -19,7 +19,8 @@
<select id="queryGoodsCategoryList" resultType="com.xzx.gc.shop.vo.QueryGoodsCategoryListVo">
SELECT
- *
+ a.*,
+ a.CREATED_TIME createTime
FROM
xzx_score_goods_category a
WHERE 1 = 1
@@ -37,7 +38,8 @@
<select id="viewGoodsCategoryOneList" resultType="com.xzx.gc.shop.vo.ViewGoodsCategoryListVo">
SELECT
- *
+ a.*,
+ a.CREATED_TIME createTime
FROM
xzx_score_goods_category a
WHERE 1 = 1
@@ -46,7 +48,8 @@
<select id="viewGoodsCategoryList" resultType="com.xzx.gc.shop.vo.ViewGoodsCategoryListVo">
SELECT
- a.*,
+ a.*,,
+ a.CREATED_TIME createTime,
(select name from xzx_score_goods_category where a.parent_id = id) parentName
FROM
xzx_score_goods_category a
diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
index 2eb9cab..2c3ba2f 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml
@@ -4,7 +4,8 @@
<select id="queryGoodsList" resultType="com.xzx.gc.shop.vo.QueryGoodsListVo">
SELECT
- *
+ a.*,
+ a.CREATED_TIME createTime
FROM
xzx_score_goods a
WHERE 1 = 1
diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
index bd91fb4..b5d4a59 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
@@ -5,15 +5,15 @@
<select id="queryOrderList" resultType="com.xzx.gc.shop.vo.QueryOrderListVo">
SELECT
a.*,
+ a.CREATED_TIME createTime,
b.name name,
b.mobile_phone phone,
d.express_com expressCom,
- d.express_no expressNo,
+ d.express_no expressNo
FROM
xzx_score_order a
- left join xzx_user_info b where b.user_id = a.user_id
--- left join xzx_score_order_details c where c.order_id = a.id
- left join xzx_score_express_info d where d.order_id = a.id
+ left join xzx_user_info b on b.user_id = a.user_id
+ left join xzx_score_express_info d on d.order_id = a.id
WHERE 1 = 1
<if test="orderNo != null and orderNo != ''">
and a.order_no like concat('%',#{orderNo},'%')
--
Gitblit v1.9.1