From 75590aa92b5198626c47a9861c99d557649ec674 Mon Sep 17 00:00:00 2001
From: "kuang.yifei@iwhalecloud.com" <kuang.yifei@iwhalecloud.com>
Date: Thu, 9 Jun 2022 16:04:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=B6=88=E8=B4=B9=E8=80=85?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0+=E6=84=8F=E5=90=91=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ghy/web/controller/order/OrderMasterController.java  | 5 +++++
 .../src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
index 92e1ca81..7afac0f6 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
@@ -102,6 +102,9 @@ public class OrderMasterController extends BaseController {
             // 师傅信息
             Worker worker = workerService.selectById(master.getWorkerId());
 
+            // 消费者信息
+            Customer customer = customerService.selectByCustomerId(master.getCustomerId());
+
             // 商品规格及信息
             List<OrderGoods> orderStandardList = orderGoodsService.selectByOrderMasterId(master.getId());
 
@@ -131,6 +134,8 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setTotalMoney(financialMaster.getTotalMoney());
             orderListResponse.setPayMoney(financialMaster.getPayMoney());
             orderListResponse.setWorkerName(worker.getName());
+            orderListResponse.setCustomerName(customer.getName());
+            orderListResponse.setServerTime(master.getRevTime());
             orderListResponse.setOrderStatus(master.getOrderStatus());
             orderListResponse.setPayStatus(master.getPayStatus());
             orderListResponse.setPayType(master.getPayType());
diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
index d2f08a3a..fef128d9 100644
--- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
+++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
@@ -3,6 +3,7 @@ package com.ghy.web.pojo.vo;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -15,6 +16,10 @@ public class OrderListResponse {
 
     private String workerName;
 
+    private String customerName;
+
+    private Date serverTime;
+
     private String goodsName;
 
     private Integer orderStatus;