From 2e2a241d0365acf73dfe17087f2541b1a1edb337 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 18 十月 2021 18:05:23 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderPageVO.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderPageVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderPageVO.java
index b4ff08c..0d831c9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderPageVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderPageVO.java
@@ -1,16 +1,21 @@
package com.panzhihua.common.model.vos.shop;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
@Data
@ApiModel("订单信息")
public class ComShopOrderPageVO {
+
+ @ApiModelProperty(value = "订单id")
+ private Long orderId;
@ApiModelProperty(value = "订单号")
private String orderNo;
@@ -43,6 +48,7 @@
private Integer payType;
@ApiModelProperty(value = "支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date payTime;
@ApiModelProperty(value = "订单发货状态（1.未发货 2.已发货）")
@@ -55,14 +61,20 @@
private String logisticsNo;
@ApiModelProperty(value = "下单时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
@ApiModelProperty(value = "支付单号")
private String payNo;
@ApiModelProperty(value = "发货时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date deliveryTime;
+ @ApiModelProperty(value = "收货时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date receivingTime;
+
@ApiModelProperty(value = "订单下商品信息")
private List<ComShopOrderGoodsVO> orderGoodsVOList;
--
Gitblit v1.7.1