From 63a846c145704323d29087f353ba330afc5f60e4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 29 Sep 2021 14:44:43 +0800
Subject: [PATCH] 20210928

---
 src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 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 f18c329..954534b 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,10 +24,14 @@
     private String orderNo;
 
     @ApiModelProperty(value = "下单时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date orderTime;
 
     @ApiModelProperty(value = "支付方式")
     private String payMethod;
+
+    @ApiModelProperty(value = "支付方式类型")
+    private Integer payMethodType;
 
     @ApiModelProperty(value = "状态")
     private Integer status;
@@ -54,4 +59,24 @@
 
     @ApiModelProperty(value = "订单退款信息")
     private OrderRefundVo orderRefund;
+
+    @ApiModelProperty(value = "剩余时间")
+    private Long remainTime;
+
+    public Integer getPayMethodType() {
+        if (this.payMethod == null) {
+            return 0;
+        }
+        switch (this.payMethod) {
+            case "微信支付" :
+                return 1;
+            case "支付宝支付" :
+                return 2;
+            case "积分支付" :
+                return 3;
+            default:
+                return 3;
+        }
+    }
 }
+

--
Gitblit v1.9.1