From 7ff90bb113006de641192d9d0c81491089efef76 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Mon, 7 Nov 2022 01:33:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ghy/web/controller/order/OrderController.java | 2 +-
 .../com/ghy/web/controller/order/OrderMasterController.java     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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 1c424bf8..73097be3 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
@@ -201,7 +201,7 @@ public class OrderController extends BaseController {
             om.setAllSelfAssigned(1);
             BigDecimal realPay = fm.getPayMoney();
             for (FinancialDetail financialDetail : financialDetailService.selectByFinancialMasterId(fm.getId())) {
-                if (FinancialDetailType.ORDER_FEE.equals(financialDetail.getFinancialDetailType())) {
+                if (FinancialDetailType.ORDER_FEE.getCode().equals(financialDetail.getFinancialDetailType())) {
                     om.setAllSelfAssigned(0);
                 }
                 realPay = realPay.subtract(financialDetail.getPayMoney());
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 968992fe..e53bf39a 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
@@ -542,6 +542,7 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setStandardList(standardList);
             orderListResponse.setAddress(completeAddress);
             orderListResponse.setServerTime(orderMaster.getRevTime());
+            orderListResponse.setServerMoney(financialMaster.getServerMoney());
             orderListResponse.setExpectTimeStart(orderMaster.getExpectTimeStart());
             orderListResponse.setExpectTimeEnd(orderMaster.getExpectTimeEnd());
             orderListResponse.setExpectTimeStartFront(orderMaster.getExpectTimeStart());