diff --git a/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java b/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java index 352c205a..84cc4992 100644 --- a/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java +++ b/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java @@ -30,25 +30,6 @@ import java.util.stream.Collectors; @RestControllerAdvice @Slf4j public class CzgControllerAdvice { - @ResponseBody - @ExceptionHandler(value = Exception.class) - @ResponseStatus(HttpStatus.OK) - public CzgResult errorHandler(Exception ex) { - Throwable rootCause = ex; - while (rootCause.getCause() != null) { - rootCause = rootCause.getCause(); - if (rootCause instanceof CzgException) { - break; - } - } - // 处理自定义异常 - if (rootCause instanceof CzgException czgException) { - return CzgResult.failure(czgException.getCode(), czgException.getMessage()); - } - setErrorLog(ex); - return CzgResult.failure(CzgRespCode.SYSTEM_ERROR.getCode(), ex.getMessage()); - } - @ResponseBody @ExceptionHandler(value = NoResourceFoundException.class) @ResponseStatus(HttpStatus.OK) @@ -113,9 +94,9 @@ public class CzgControllerAdvice { return CzgResult.failure(ex.getCode(), ex.getMsg()); } - @ResponseBody +// @ResponseBody @ExceptionHandler(OrderValidateException.class) - @ResponseStatus(HttpStatus.OK) +// @ResponseStatus(HttpStatus.OK) public CzgResult handleOrderValidateException(OrderValidateException ex) { log.error("订单校验异常:{}", ex.getMessage()); return CzgResult.failure(ex.getCode(), ex.getMsg()); @@ -161,6 +142,25 @@ public class CzgControllerAdvice { return CzgResult.failure(CzgRespCode.RECORD_EXISTED); } + @ResponseBody + @ExceptionHandler(value = Exception.class) + @ResponseStatus(HttpStatus.OK) + public CzgResult errorHandler(Exception ex) { + Throwable rootCause = ex; + while (rootCause.getCause() != null) { + rootCause = rootCause.getCause(); + if (rootCause instanceof CzgException) { + break; + } + } + // 处理自定义异常 + if (rootCause instanceof CzgException czgException) { + return CzgResult.failure(czgException.getCode(), czgException.getMessage()); + } + setErrorLog(ex); + return CzgResult.failure(CzgRespCode.SYSTEM_ERROR.getCode(), ex.getMessage()); + } + private void setErrorLog(Exception ex) { log.error(ex.getMessage()); log.error("错误", ex); diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/exception/CzgException.java b/cash-common/cash-common-tools/src/main/java/com/czg/exception/CzgException.java index 0afe4530..fc5efcbf 100644 --- a/cash-common/cash-common-tools/src/main/java/com/czg/exception/CzgException.java +++ b/cash-common/cash-common-tools/src/main/java/com/czg/exception/CzgException.java @@ -2,6 +2,8 @@ package com.czg.exception; import com.czg.resp.CzgRespCode; +import java.io.Serial; + /** * 自定义异常 * @@ -9,6 +11,7 @@ import com.czg.resp.CzgRespCode; * @since 1.0.0 */ public class CzgException extends RuntimeException { + @Serial private static final long serialVersionUID = 1L; private int code; diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/exception/OrderValidateException.java b/cash-common/cash-common-tools/src/main/java/com/czg/exception/OrderValidateException.java index 269637f8..58a8a7e5 100644 --- a/cash-common/cash-common-tools/src/main/java/com/czg/exception/OrderValidateException.java +++ b/cash-common/cash-common-tools/src/main/java/com/czg/exception/OrderValidateException.java @@ -16,7 +16,7 @@ public class OrderValidateException extends RuntimeException{ private String msg; public OrderValidateException(String msg) { - super(msg); +// super(msg); this.code = CzgRespCode.FAILURE.getCode(); this.msg = msg; } diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java index 32db55c1..aeb3cd4c 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java @@ -572,7 +572,8 @@ public class MkDistributionUserServiceImpl extends ServiceImpl 2) { return; }