From 88e5eab44750a6cecb0a9dce98eda09877264fdd Mon Sep 17 00:00:00 2001
From: HH <hhawking@qq.com>
Date: Wed, 21 Dec 2022 15:53:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E5=92=8C?=
 =?UTF-8?q?=E5=AD=90=E8=AE=A2=E5=8D=95=E7=BB=93=E7=AE=97=E6=97=B6=E6=89=8B?=
 =?UTF-8?q?=E7=BB=AD=E8=B4=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ghy-admin/src/main/resources/logback.xml         | 16 ++++++++--------
 .../service/impl/OrderDetailServiceImpl.java     |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ghy-admin/src/main/resources/logback.xml b/ghy-admin/src/main/resources/logback.xml
index 8534f160..8daba945 100644
--- a/ghy-admin/src/main/resources/logback.xml
+++ b/ghy-admin/src/main/resources/logback.xml
@@ -25,14 +25,14 @@
 		<encoder>
 			<pattern>${log.pattern}</pattern>
 		</encoder>
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>DEBUG</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>DENY</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>ACCEPT</onMismatch>
-        </filter>
+<!--		<filter class="ch.qos.logback.classic.filter.LevelFilter">-->
+<!--            &lt;!&ndash; 过滤的级别 &ndash;&gt;-->
+<!--            <level>DEBUG</level>-->
+<!--            &lt;!&ndash; 匹配时的操作：接收（记录） &ndash;&gt;-->
+<!--            <onMatch>DENY</onMatch>-->
+<!--            &lt;!&ndash; 不匹配时的操作：拒绝（不记录） &ndash;&gt;-->
+<!--            <onMismatch>ACCEPT</onMismatch>-->
+<!--        </filter>-->
 	</appender>
 
 	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
index 11aa5c68..c5eb87cc 100644
--- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
+++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
@@ -469,7 +469,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
             // 如果确认支付失败 这里抛出异常 回滚订单状态
             Assert.isTrue(status, response.getString("error_msg"));
             // 待提现金额里加入子财务单金额
-            dtx = dtx.add(payMoney);
+            dtx = dtx.add(fdPayMoney);
             // 修改平台抽成子财务单金额
             update.setPayMoney(platformFeeFD.getPayMoney().subtract(fee));
             financialDetailService.updateFinancialDetail(update);