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 6d46860e..968992fe 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 @@ -453,7 +453,7 @@ public class OrderMasterController extends BaseController { orderStandardDetail.setFinancialChangeRecord(financialChangeRecords); orderStandardDetail.setOrderStatus(orderDetail.getOrderStatus()); orderStandardDetail.setIsOverTime(isOverTime); - + orderStandardDetail.setServerMoney(financialMaster.getServerMoney()); AfterServiceRecord afterServiceRecord = new AfterServiceRecord(); afterServiceRecord.setOrderDetailId(orderDetail.getId()); List records =afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord); diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java index fc769b5a..ee06d80c 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java @@ -53,4 +53,6 @@ public class OrderStandardDetail { private Boolean isOnlyServ; private Boolean isOverTime; + + private BigDecimal serverMoney; }