From 450af253b1cd93411a6951fb3740ae78f6a3806c Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Thu, 10 Sep 2020 00:21:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85->=E6=9C=AA=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/order/service/dto/YxStoreOrderStatusDto.java | 9 ++++++++-
 .../yixiang/modules/order/rest/StoreOrderController.java | 6 +++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderStatusDto.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderStatusDto.java
index 9a66acbc..e521ef91 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderStatusDto.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderStatusDto.java
@@ -5,9 +5,12 @@
  */
 package co.yixiang.modules.order.service.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
 * @author hupeng
@@ -28,5 +31,9 @@ public class YxStoreOrderStatusDto implements Serializable {
     private String changeMessage;
 
     /** 操作时间 */
-    private Integer changeTime;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    private Date changeTime;
 }
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java b/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
index eb3661e0..06240222 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
@@ -127,10 +127,10 @@ public class StoreOrderController {
     }
 
     @ApiOperation(value = "根据订单id获取订单详情")
-    @GetMapping(value = "/getStoreOrderDetail")
+    @GetMapping(value = "/getStoreOrderDetail/{id}")
     @PreAuthorize("hasAnyRole('admin','YXSTOREORDER_ALL','YXSTOREORDER_SELECT','YXEXPRESS_SELECT')")
-    public ResponseEntity getYxStoreOrders(@PathVariable Long orderId) {
-        return new ResponseEntity<>(yxStoreOrderService.getOrderDetail(orderId), HttpStatus.OK);
+    public ResponseEntity getYxStoreOrders(@PathVariable Long id) {
+        return new ResponseEntity<>(yxStoreOrderService.getOrderDetail(id), HttpStatus.OK);
     }