From 1f423bcdf60f2f66cb6c7208a56e7543f2441520 Mon Sep 17 00:00:00 2001 From: donqi Date: Tue, 20 Sep 2022 23:45:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=83=A8=E5=88=86=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/order/OrderController.java | 12 ++++++------ .../controller/order/OrderDetailController.java | 12 ++++++------ .../controller/order/OrderMasterController.java | 16 ++++++++-------- .../com/ghy/web/pojo/vo/OrderListResponse.java | 3 +++ 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index f0003384..0cb16b39 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -533,7 +533,7 @@ public class OrderController extends BaseController { Worker worker = master.getWorkerId() != null ? workerService.selectById(master.getWorkerId()) : null; // 消费者信息 - Customer customer = customerService.selectByCustomerId(master.getCustomerId()); +// Customer customer = customerService.selectByCustomerId(master.getCustomerId()); // 商品规格及信息 List orderStandardList = orderGoodsService.selectByOrderMasterId(master.getId()); @@ -578,8 +578,8 @@ public class OrderController extends BaseController { orderListResponse.setPayMoney(financialMaster.getPayMoney()); orderListResponse.setWorkerName(worker == null ? "" : worker.getName()); orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone()); - orderListResponse.setCustomerName(customer.getName()); - orderListResponse.setCustomerPhone(customer.getPhone()); + orderListResponse.setCustomerName(customerAddress.getName()); + orderListResponse.setCustomerPhone(customerAddress.getPhone()); orderListResponse.setServerTime(master.getRevTime()); orderListResponse.setExpectTimeStart(master.getExpectTimeStart()); orderListResponse.setExpectTimeEnd(master.getExpectTimeEnd()); @@ -611,7 +611,7 @@ public class OrderController extends BaseController { Worker worker = workerService.selectById(detail.getWorkerId()); // 消费者信息 - Customer customer = customerService.selectByCustomerId(detail.getCustomerId()); +// Customer customer = customerService.selectByCustomerId(detail.getCustomerId()); // 商品规格及信息 List orderStandardList = orderGoodsService.selectByOrderDetailId(detail.getId()); @@ -656,8 +656,8 @@ public class OrderController extends BaseController { orderListResponse.setPayMoney(financialDetail.getPayMoney()); orderListResponse.setWorkerName(worker.getName()); orderListResponse.setWorkerPhone(worker.getPhone()); - orderListResponse.setCustomerName(customer.getName()); - orderListResponse.setCustomerPhone(customer.getPhone()); + orderListResponse.setCustomerName(customerAddress.getName()); + orderListResponse.setCustomerPhone(customerAddress.getPhone()); orderListResponse.setOrderStatus(detail.getOrderStatus()); orderListResponse.setPayStatus(orderMaster.getPayStatus()); orderListResponse.setPayType(orderMaster.getPayType()); diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index 989c4767..e7f2c196 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -123,7 +123,7 @@ public class OrderDetailController extends BaseController { Worker worker = workerService.selectById(detail.getWorkerId()); // 消费者信息 - Customer customer = customerService.selectByCustomerId(detail.getCustomerId()); +// Customer customer = customerService.selectByCustomerId(detail.getCustomerId()); // 商品规格及信息 List orderStandardList = orderGoodsService.selectByOrderDetailId(detail.getId()); @@ -173,8 +173,8 @@ public class OrderDetailController extends BaseController { orderListResponse.setPayMoney(financialDetail.getPayMoney()); orderListResponse.setWorkerName(worker.getName()); orderListResponse.setWorkerPhone(worker.getPhone()); - orderListResponse.setCustomerName(customer.getName()); - orderListResponse.setCustomerPhone(customer.getPhone()); + orderListResponse.setCustomerName(customerAddress.getName()); + orderListResponse.setCustomerPhone(customerAddress.getPhone()); orderListResponse.setOrderStatus(detail.getOrderStatus()); orderListResponse.setPayStatus(orderMaster.getPayStatus()); orderListResponse.setPayType(orderMaster.getPayType()); @@ -218,7 +218,7 @@ public class OrderDetailController extends BaseController { Worker worker = workerService.selectById(detail.getWorkerId()); // 消费者信息 - Customer customer = customerService.selectByCustomerId(detail.getCustomerId()); +// Customer customer = customerService.selectByCustomerId(detail.getCustomerId()); // 商品规格及信息 List orderStandardList = orderGoodsService.selectByOrderDetailId(detail.getId()); @@ -262,8 +262,8 @@ public class OrderDetailController extends BaseController { orderListResponse.setPayMoney(financialDetail.getPayMoney()); orderListResponse.setWorkerName(worker.getName()); orderListResponse.setWorkerPhone(worker.getPhone()); - orderListResponse.setCustomerName(customer.getName()); - orderListResponse.setCustomerPhone(customer.getPhone()); + orderListResponse.setCustomerName(customerAddress.getName()); + orderListResponse.setCustomerPhone(customerAddress.getPhone()); orderListResponse.setOrderStatus(detail.getOrderStatus()); orderListResponse.setPayStatus(orderMaster.getPayStatus()); orderListResponse.setPayType(orderMaster.getPayType()); 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 f3ed3cee..3464de09 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 @@ -111,7 +111,7 @@ public class OrderMasterController extends BaseController { Worker worker = master.getWorkerId() != null ? workerService.selectById(master.getWorkerId()) : null; // 消费者信息 - Customer customer = customerService.selectByCustomerId(master.getCustomerId()); +// Customer customer = customerService.selectByCustomerId(master.getCustomerId()); // 商品规格及信息 List orderStandardList = orderGoodsService.selectByOrderMasterId(master.getId()); @@ -150,8 +150,8 @@ public class OrderMasterController extends BaseController { orderListResponse.setPayMoney(financialMaster.getPayMoney()); orderListResponse.setWorkerName(worker == null ? "" : worker.getName()); orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone()); - orderListResponse.setCustomerName(customer.getName()); - orderListResponse.setCustomerPhone(customer.getPhone()); + orderListResponse.setCustomerName(customerAddress.getName()); + orderListResponse.setCustomerPhone(customerAddress.getPhone()); orderListResponse.setServerTime(master.getRevTime()); orderListResponse.setExpectTimeStart(master.getExpectTimeStart()); orderListResponse.setExpectTimeEnd(master.getExpectTimeEnd()); @@ -249,7 +249,7 @@ public class OrderMasterController extends BaseController { WorkerCertification workerRealInfo = workerCertificationService.selectByWorkerId(orderMaster.getWorkerId()); // 消费者信息 - Customer customer = customerService.selectByCustomerId(orderMaster.getCustomerId()); +// Customer customer = customerService.selectByCustomerId(orderMaster.getCustomerId()); // 商品规格及信息 List orderStandardList = orderGoodsService.selectByOrderMasterId(orderMaster.getId()); @@ -284,8 +284,8 @@ public class OrderMasterController extends BaseController { orderListResponse.setPayMoney(financialMaster.getPayMoney()); orderListResponse.setWorkerName(workerRealInfo == null ? worker.getName() : workerRealInfo.getName()); orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone()); - orderListResponse.setCustomerName(customer.getName()); - orderListResponse.setCustomerPhone(customer.getPhone()); + orderListResponse.setCustomerName(customerAddress.getName()); + orderListResponse.setCustomerPhone(customerAddress.getPhone()); orderListResponse.setOrderStatus(orderMaster.getOrderStatus()); orderListResponse.setPayStatus(orderMaster.getPayStatus()); orderListResponse.setPayType(orderMaster.getPayType()); @@ -324,8 +324,8 @@ public class OrderMasterController extends BaseController { orderMasterResponseVo.setWorkerName(worker.getName()); } // 消费者信息 - Customer customer = customerService.selectByCustomerId(master.getCustomerId()); - orderMasterResponseVo.setCustomerName(customer.getName()); + CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId()); + orderMasterResponseVo.setCustomerName(customerAddress.getName()); orderMasterResponseVos.add(orderMasterResponseVo); } 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 1ed993ce..3901bfa4 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 @@ -1,5 +1,7 @@ package com.ghy.web.pojo.vo; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ghy.payment.domain.OrderTimeoutRecord; import lombok.Data; @@ -34,6 +36,7 @@ public class OrderListResponse { private Date expectTimeStart; + @JsonFormat(pattern = "HH:mm:ss") private Date expectTimeEnd; private Date workBeginTime;