From b0476d6bedd34838bbe3c1243326a1ce60ab9ffb Mon Sep 17 00:00:00 2001 From: "kuang.yifei@iwhalecloud.com" Date: Wed, 8 Jun 2022 14:14:56 +0800 Subject: [PATCH] fix --- .../com/ghy/web/controller/order/OrderMasterController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 30afadeb..a06b484d 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,9 +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()); + orderListResponse.setOrderStatus(master.getOrderStatus()); + orderListResponse.setPayStatus(master.getPayStatus()); + orderListResponse.setPayType(master.getPayType()); orderListResponses.add(orderListResponse); });