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