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; }