From eb19fea84c68d7447b07ee105737d4ea8549249b Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 08 七月 2021 11:07:58 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderPageVO.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 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..743eecb 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,5 +1,6 @@
package com.panzhihua.common.model.vos.shop;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,6 +12,9 @@
@Data
@ApiModel("订单信息")
public class ComShopOrderPageVO {
+
+ @ApiModelProperty(value = "订单id")
+ private Long orderId;
@ApiModelProperty(value = "订单号")
private String orderNo;
@@ -43,6 +47,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 +60,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