From 09cd31ec75e8492feb29bac46e64c15f5d71383e Mon Sep 17 00:00:00 2001 From: "kuang.yifei@iwhalecloud.com" Date: Tue, 7 Jun 2022 17:47:35 +0800 Subject: [PATCH] fix --- .../com/ghy/web/controller/order/OrderMasterController.java | 3 +++ .../main/java/com/ghy/web/pojo/vo/OrderListResponse.java | 6 ++++++ 2 files changed, 9 insertions(+) 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 d5ea762e..30afadeb 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 @@ -117,6 +117,9 @@ public class OrderMasterController extends BaseController { orderListResponse.setTotalMoney(financialMaster.getTotalMoney()); orderListResponse.setPayMoney(financialMaster.getPayMoney()); orderListResponse.setWorkerName(worker.getName()); + orderListResponse.setOrderStatus(orderMaster.getOrderStatus()); + orderListResponse.setPayStatus(orderMaster.getPayStatus()); + orderListResponse.setPayType(orderMaster.getPayType()); orderListResponses.add(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 30773afa..b911fa88 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 @@ -15,6 +15,12 @@ public class OrderListResponse { private String standardName; + private Integer orderStatus; + + private Integer payStatus; + + private Integer payType; + private Integer num; private BigDecimal totalMoney;