diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index e64d025c..1c424bf8 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -954,6 +954,7 @@ public class OrderController extends BaseController { orderListResponse.setCustomerRemark(master.getRemark()); orderListResponse.setOrderTimeoutRecords(timeoutRecords); orderListResponse.setChangeMoney(changeMoney); + orderListResponse.setServerMoney(financialMaster.getServerMoney()); orderListResponse.setAfterServiceRecordList(afterServiceRecords); 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 c306ebff..86a6ebbd 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 @@ -87,6 +87,8 @@ public class OrderListResponse { private Boolean isOverTime; + private BigDecimal serverMoney; + private List orderTimeoutRecords; private List standardList;