From c2af97c87774e9e675381106cac483f0e3d8f3f7 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Sun, 26 Sep 2021 16:47:10 +0800 Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall --- src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java index 36d8f8e..4eacd0c 100644 --- a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java +++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java @@ -1,5 +1,6 @@ package cc.mrbird.febs.mall.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,6 +24,7 @@ private String orderNo; @ApiModelProperty(value = "下单时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date orderTime; @ApiModelProperty(value = "支付方式") @@ -51,4 +53,10 @@ @ApiModelProperty(value = "订单明细") private List<OrderItemVo> items; + + @ApiModelProperty(value = "订单退款信息") + private OrderRefundVo orderRefund; + + @ApiModelProperty(value = "剩余时间") + private Long remainTime; } -- Gitblit v1.9.1