From 72e255338daf793bf64bbf63adfe5a23aeec7cc6 Mon Sep 17 00:00:00 2001 From: "kuang.yifei@iwhalecloud.com" Date: Tue, 14 Jun 2022 17:30:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=80=BB=E8=BE=91=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ghy/web/controller/order/OrderController.java | 2 +- .../com/ghy/web/controller/order/OrderDetailController.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 acb5ea6b..44874f7e 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 @@ -139,7 +139,7 @@ public class OrderController extends BaseController { od.setOrderType(om.getOrderType()); od.setOrderStatus(OrderStatus.GOING.code()); od.setWorkerId(request.getWorkerId()); - od.setRevTime(new Date()); + od.setRevTime(om.getRevTime()); orderDetailService.insertOrderDetail(od); // 批量生成订单商品 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 91dee73c..8be9f4ce 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 @@ -144,6 +144,7 @@ public class OrderDetailController extends BaseController { orderListResponse.setOrderMasterCode(detail.getCode()); orderListResponse.setStandardList(standardList); orderListResponse.setAddress(customerAddress.getAddress()); + orderListResponse.setServerTime(detail.getRevTime()); orderListResponses.add(orderListResponse); });