From 84fd473b76a2802a9c37e957e271ee8608fa0192 Mon Sep 17 00:00:00 2001 From: donqi Date: Wed, 29 Jun 2022 18:08:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= 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 | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) 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 b07db3c3..d1044f14 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 @@ -235,8 +235,8 @@ public class OrderMasterController extends BaseController { orderListResponse.setDiscountMoney(financialMaster.getDiscountMoney()); orderListResponse.setTotalMoney(financialMaster.getTotalMoney()); orderListResponse.setPayMoney(financialMaster.getPayMoney()); - orderListResponse.setWorkerName(worker.getName()); - orderListResponse.setWorkerPhone(worker.getPhone()); + orderListResponse.setWorkerName(worker == null ? "" : worker.getName()); + orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone()); orderListResponse.setCustomerName(customer.getName()); orderListResponse.setCustomerPhone(customer.getPhone()); orderListResponse.setOrderStatus(orderMaster.getOrderStatus()); @@ -248,6 +248,7 @@ public class OrderMasterController extends BaseController { orderListResponse.setExpectTimeStart(orderMaster.getExpectTimeStart()); orderListResponse.setExpectTimeEnd(orderMaster.getExpectTimeEnd()); orderListResponse.setCreateTime(orderMaster.getCreateTime()); + orderListResponse.setRemark(orderMaster.getRemark()); orderListResponse.setOrderStandardDetailList(orderStandardDetails); return AjaxResult.success(orderListResponse); 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 1fb2fdf1..880b8e83 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 @@ -57,6 +57,8 @@ public class OrderListResponse { private Date createTime; + private String remark; + private List standardList; private List orderStandardDetailList;