Browse Source

修改提示语

master
xh-pan1 1 year ago
parent
commit
a982294157
  1. 2
      cereshop-app/src/main/java/com/shop/cereshop/app/exception/GlobalExceptionHandler.java
  2. 1
      cereshop-app/src/main/java/com/shop/cereshop/app/service/order/impl/CereShopOrderServiceImpl.java
  3. 1
      cereshop-business/src/main/java/com/shop/cereshop/business/param/product/SkuParam.java
  4. 2
      cereshop-commons/src/main/java/com/shop/cereshop/commons/exception/BaseException.java

2
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());

1
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()){

1
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;

2
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();
}

Loading…
Cancel
Save