From 2d15dada61e8f5e1084fbdda3788d5b663ddbb01 Mon Sep 17 00:00:00 2001 From: clunt Date: Mon, 7 Nov 2022 00:21:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/web/controller/order/OrderMasterController.java | 2 +- .../src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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; }