From a9822941578d2b6d2a3dac5f39598231003ea5c6 Mon Sep 17 00:00:00 2001 From: xh-pan1 Date: Thu, 17 Aug 2023 03:48:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/shop/cereshop/app/exception/GlobalExceptionHandler.java | 2 +- .../shop/cereshop/app/service/order/impl/CereShopOrderServiceImpl.java | 1 - .../main/java/com/shop/cereshop/business/param/product/SkuParam.java | 1 - .../main/java/com/shop/cereshop/commons/exception/BaseException.java | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/exception/GlobalExceptionHandler.java b/cereshop-app/src/main/java/com/shop/cereshop/app/exception/GlobalExceptionHandler.java index 4dcc1cd..2746b53 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/exception/GlobalExceptionHandler.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/exception/GlobalExceptionHandler.java @@ -37,7 +37,7 @@ public class GlobalExceptionHandler { //如果拿到分布式锁,解锁 e.getRedissonLock().unlock(); } - if(!EmptyUtils.isEmpty(e.getErrorData())){ + if(!EmptyUtils.isEmpty(e.getErrorData()) || !EmptyUtils.isEmpty(e.getMessage())){ return new Result(e.getCode(),e); } return new Result(e.getCode()); diff --git a/cereshop-app/src/main/java/com/shop/cereshop/app/service/order/impl/CereShopOrderServiceImpl.java b/cereshop-app/src/main/java/com/shop/cereshop/app/service/order/impl/CereShopOrderServiceImpl.java index 2c0b09b..d8897dd 100644 --- a/cereshop-app/src/main/java/com/shop/cereshop/app/service/order/impl/CereShopOrderServiceImpl.java +++ b/cereshop-app/src/main/java/com/shop/cereshop/app/service/order/impl/CereShopOrderServiceImpl.java @@ -507,7 +507,6 @@ public class CereShopOrderServiceImpl implements CereShopOrderService { //根据子订单查询该订单店铺id shopIds = cereShopOrderDAO.findShopId(param.getOrderId()); } - System.out.println("支付订单号为：" + orderFormId); int paymentMode = param.getPaymentMode(); //调用支付接口 if(PayConfig.paymentMode == IntegerEnum.ORDER_PAY_XS.getCode()){ diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/SkuParam.java b/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/SkuParam.java index 9c28759..7a6d6d7 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/SkuParam.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/param/product/SkuParam.java @@ -9,7 +9,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.List; diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/exception/BaseException.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/exception/BaseException.java index e230789..29bcf8b 100644 --- a/cereshop-commons/src/main/java/com/shop/cereshop/commons/exception/BaseException.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/exception/BaseException.java @@ -87,7 +87,7 @@ public abstract class BaseException extends Exception { StringBuffer sb = new StringBuffer(); sb.append("系统异常，异常代码[").append(this.code).append("]\n"); sb.append("异常信息:[").append(this.message).append("]\n"); - sb.append("异常详情:[").append(this.message).append("]\n"); + sb.append("异常详情:[").append(this.errorData).append("]\n"); sb.append(super.toString()); return sb.toString(); }