全局异常提示,去掉 seata 的异常捕获。
This commit is contained in:
parent
54d6e6e885
commit
abb9d189d9
@ -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异常
|
||||
*/
|
||||
|
||||
@ -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;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user