From ebd1a3cf4fca45149b1bcb5c7772ec9bdc778593 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com>
Date: Tue, 11 Jan 2022 18:01:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=8B=A6=E6=88=AA=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0order=EF=BC=8C=E5=AE=9A=E4=B9=89=E4=BC=98=E5=85=88?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exception/service/BusinessExceptionHandlerAdvice.java       | 2 ++
 .../mall/ebtp/core/config/SeataExceptionHandlerAdvice.java      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/exception/service/BusinessExceptionHandlerAdvice.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/exception/service/BusinessExceptionHandlerAdvice.java
index 3d81188..efcfdbc 100644
--- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/exception/service/BusinessExceptionHandlerAdvice.java
+++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/exception/service/BusinessExceptionHandlerAdvice.java
@@ -11,6 +11,7 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.core.annotation.Order;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.dao.EmptyResultDataAccessException;
@@ -43,6 +44,7 @@ import java.util.Map;
  */
 @Slf4j
 @ControllerAdvice
+@Order()
 @ResponseBody
 @ConditionalOnProperty(name = "mconfig.io.seata.core.exception-handle-enabled", matchIfMissing = true)
 public class BusinessExceptionHandlerAdvice {
diff --git a/uboot-core/src/main/java/com/chinaunicom/mall/ebtp/core/config/SeataExceptionHandlerAdvice.java b/uboot-core/src/main/java/com/chinaunicom/mall/ebtp/core/config/SeataExceptionHandlerAdvice.java
index 276ed26..127021e 100644
--- a/uboot-core/src/main/java/com/chinaunicom/mall/ebtp/core/config/SeataExceptionHandlerAdvice.java
+++ b/uboot-core/src/main/java/com/chinaunicom/mall/ebtp/core/config/SeataExceptionHandlerAdvice.java
@@ -9,6 +9,7 @@ import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpStatus;
 import org.springframework.transaction.TransactionSystemException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
@@ -29,6 +30,7 @@ import java.util.Objects;
  */
 @Slf4j
 @ControllerAdvice
+@Order(1)
 @ResponseBody
 @ConditionalOnProperty(name = "mconfig.io.seata.core.exception-handle-enabled", matchIfMissing = true)
 public class SeataExceptionHandlerAdvice {