From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 21 八月 2021 16:35:14 +0800
Subject: [PATCH] 随手拍改版接口开发

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java
index 15a7401..013cbf3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java
@@ -1,5 +1,6 @@
 package com.panzhihua.common.model.dtos.shop;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,16 +27,24 @@
     private String receiverPhone;
     @ApiModelProperty(value = "商品",example = "鞋")
     private String goodsName;
+    @ApiModelProperty(value = "店铺名称",example = "小二的店")
+    private String storeName;
     @ApiModelProperty(value = "订单状态(1.待付款 2.代发货 3.待收货 4.待评价 5.已完成 6.已取消)",example = "1")
-    private Date status;
-    @ApiModelProperty(value = "下单时间-开始",example = "1")
+    private Integer status;
+    @ApiModelProperty(value = "下单时间-开始",example = "2021-4-10 10:38:25")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private String createAtStart;
-    @ApiModelProperty(value = "下单时间-结束",example = "1")
+    @ApiModelProperty(value = "下单时间-结束",example = "2021-4-20 10:38:29")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createAtEnd;
     @ApiModelProperty(value = "分页-当前页数",example = "1", required = true)
     private Long pageNum;
     @ApiModelProperty(value = "分页-每页记录数",example = "10", required = true)
     private Long pageSize;
-    @JsonIgnore
+    @ApiModelProperty(hidden = true)
     private Long userId;
+    @ApiModelProperty(hidden = true)
+    private Long storeId;
+    @ApiModelProperty(hidden = true)
+    private Long storeUserId;
 }

--
Gitblit v1.7.1