From de09e5bf81b16e52a158fdaad6a8be142122a66d Mon Sep 17 00:00:00 2001 From: donqi Date: Wed, 15 Jun 2022 17:33:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=88=E5=82=85=E7=AB=AF=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/web/controller/order/OrderDetailController.java | 3 +++ .../src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java | 2 ++ ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) 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 c84681a0..7f08543f 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 @@ -121,6 +121,8 @@ public class OrderDetailController extends BaseController { OrderStandard orderStandard = new OrderStandard(); orderStandard.setStandardName(orderGoods.getGoodsName()); orderStandard.setStandardNum(orderGoods.getGoodsNum()); + orderStandard.setServerNum(orderGoods.getServerGoodsNum() == null ? 0 : orderGoods.getServerGoodsNum()); + orderStandard.setWaitServerNum(orderStandard.getStandardNum() - orderStandard.getServerNum()); standardList.add(orderStandard); } @@ -145,6 +147,7 @@ public class OrderDetailController extends BaseController { orderListResponse.setStandardList(standardList); orderListResponse.setAddress(customerAddress.getAddress()); orderListResponse.setServerTime(detail.getRevTime()); + orderListResponse.setCreateTime(detail.getCreateTime()); return AjaxResult.success(orderListResponse); }catch (Exception e){ 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 8d7d4e7f..2c0d781f 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 @@ -46,5 +46,7 @@ public class OrderListResponse { private String address; + private Date createTime; + private List standardList; } diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java index 2aeb3262..e25ea978 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java @@ -51,5 +51,5 @@ public class OrderDetail extends BaseEntity { @Excel(name = "服务完成时间", cellType = Excel.ColumnType.STRING) private Date workFinishTime; - + private Date createTime; }