From c6fe9ce12e900da973a46881841551abdedcf6a7 Mon Sep 17 00:00:00 2001 From: "kuang.yifei@iwhalecloud.com" Date: Thu, 9 Jun 2022 16:46:45 +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 | 2 ++ .../src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java | 4 ++++ 2 files changed, 6 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 7afac0f6..7a66ff9a 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 @@ -134,7 +134,9 @@ public class OrderMasterController extends BaseController { orderListResponse.setTotalMoney(financialMaster.getTotalMoney()); orderListResponse.setPayMoney(financialMaster.getPayMoney()); orderListResponse.setWorkerName(worker.getName()); + orderListResponse.setWorkerPhone(worker.getPhone()); orderListResponse.setCustomerName(customer.getName()); + orderListResponse.setCustomerPhone(customer.getPhone()); orderListResponse.setServerTime(master.getRevTime()); orderListResponse.setOrderStatus(master.getOrderStatus()); orderListResponse.setPayStatus(master.getPayStatus()); 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 fef128d9..067e70dc 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 @@ -16,8 +16,12 @@ public class OrderListResponse { private String workerName; + private String workerPhone; + private String customerName; + private String customerPhone; + private Date serverTime; private String goodsName;