From abb9d189d9f63219c10da19b12166bef7b5db85d Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Tue, 14 Oct 2025 21:55:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E5=BC=82=E5=B8=B8=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E5=8E=BB=E6=8E=89=20seata=20=E7=9A=84?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=8D=95=E8=8E=B7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/exception/GlobalExceptionHandler.java    | 13 +++++++++++--
 .../lakala/service/impl/LakalaApiServiceImpl.java   |  2 ++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/mall-common/src/main/java/com/suisung/mall/common/exception/GlobalExceptionHandler.java b/mall-common/src/main/java/com/suisung/mall/common/exception/GlobalExceptionHandler.java
index f36913fe..5ccd944b 100644
--- a/mall-common/src/main/java/com/suisung/mall/common/exception/GlobalExceptionHandler.java
+++ b/mall-common/src/main/java/com/suisung/mall/common/exception/GlobalExceptionHandler.java
@@ -3,7 +3,6 @@ package com.suisung.mall.common.exception;
 import cn.hutool.core.util.StrUtil;
 import com.suisung.mall.common.api.CommonResult;
 import com.suisung.mall.common.api.ResultCode;
-import io.seata.rm.datasource.exec.LockWaitTimeoutException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
@@ -91,8 +90,9 @@ public class GlobalExceptionHandler {
 
     /**
      * 处理系统级异常(数据库异常/通用异常)
+     * LockWaitTimeoutException.class
      */
-    @ExceptionHandler({SQLException.class, DataAccessException.class, LockWaitTimeoutException.class, Exception.class})
+    @ExceptionHandler({SQLException.class, DataAccessException.class})
     public CommonResult handleSystemException(HttpServletRequest req, Exception e) {
         logError(req, e.getMessage(), e);
 
@@ -103,6 +103,15 @@ public class GlobalExceptionHandler {
         return CommonResult.failed("系统内部异常，请联系管理员！");
     }
 
+    /**
+     * 处理通用异常
+     */
+    @ExceptionHandler(Exception.class)
+    public CommonResult handleGeneralException(HttpServletRequest req, Exception e) {
+        logError(req, e.getMessage(), e);
+        return CommonResult.failed("系统内部异常，请联系管理员！");
+    }
+
     /**
      * 处理业务API异常
      */
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java
index f05d4d0e..9716535f 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java
@@ -2517,7 +2517,9 @@ public class LakalaApiServiceImpl implements LakalaApiService {
             // 获取代理商分账信息
             BigDecimal platformSplitRatio = CheckUtil.isEmpty(platformReceiver.getSplit_ratio()) ? BigDecimal.valueOf(0.01) : platformReceiver.getSplit_ratio(); // 默认平台比例 1%
 
+            // 获取省级代理商接收方
             LklLedgerMerReceiverBind agent1stReceiver = lklLedgerMerReceiverBindService.getAgent1stByMerCupNo(merchantNo);
+            // 获取县级代理商接收方
             LklLedgerMerReceiverBind agent2ndReceiver = lklLedgerMerReceiverBindService.getAgent2ndByMerCupNo(merchantNo);
 
             BigDecimal agent1stSplitRatio = null;