lb-third模块异常处理优化

lb-app/src/main/java/com/ydd/app/service/impl/ApiPayServiceImpl.java

@@ -21,7 +21,7 @@ import com.ydd.module.expection.CustomAppException;
 import com.ydd.module.pay.alipay.AliPayService;
 import com.ydd.module.pay.wechat.service.WechatPayService;
 import com.ydd.module.service.*;
-import com.ydd.third.common.exception.BusinessException;
+import com.ydd.common.exception.BusinessException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;

lb-app/src/main/java/com/ydd/app/service/impl/ApiWaimaiPrintServiceImpl.java

@@ -15,7 +15,7 @@ import com.ydd.module.domain.WaimaiOrder;
 import com.ydd.module.domain.WaimaiOrderDetail;
 import com.ydd.module.enums.OrderStatusEnum;
 import com.ydd.module.service.*;
-import com.ydd.third.common.exception.BusinessException;
+import com.ydd.common.exception.BusinessException;
 import com.ydd.third.common.vo.waimai.eleme.api.entity.order.OActivity;
 import com.ydd.third.common.vo.waimai.meituan.MeituanOrderExtraVo;
 import com.ydd.third.print.request.*;

lb-third/lb-third-common/src/main/java/com/ydd/third/common/exception/BusinessException.java

@@ -16,7 +16,7 @@
  *  Author: lipengjun (939961241@qq.com)
  *
  */
-package com.ydd.third.common.exception;
+package com.ydd.common.exception;
 
 import org.springframework.http.HttpStatus;
 

lb-framework/src/main/java/com/ydd/framework/web/exception/GlobalExceptionHandler.java

@@ -3,6 +3,7 @@ package com.ydd.framework.web.exception;
 import com.ydd.common.constant.HttpStatus;
 import com.ydd.common.core.domain.Result;
 import com.ydd.common.exception.BaseException;
+import com.ydd.common.exception.BusinessException;
 import com.ydd.common.exception.CustomException;
 import com.ydd.common.exception.DemoModeException;
 import org.slf4j.Logger;
@@ -39,13 +40,24 @@ public class GlobalExceptionHandler {
      * 业务异常
      */
     @ExceptionHandler(CustomException.class)
-    public Result businessException(CustomException e) {
+    public Result customException(CustomException e) {
         if (e.getCode() == null) {
             return Result.error(e.getMessage());
         }
         return Result.error(e.getCode(), e.getMessage());
     }
 
+    /**
+     * 业务异常
+     */
+    @ExceptionHandler(BusinessException.class)
+    public Result businessException(BusinessException e) {
+        if (e.getCode() == 0) {
+            return Result.error(e.getMessage());
+        }
+        return Result.error(e.getCode(), e.getMessage());
+    }
+
     @ExceptionHandler(NoHandlerFoundException.class)
     public Result handlerNoFoundException(Exception e) {
         log.error(e.getMessage(), e);

lb-third/lb-third-common/src/main/java/com/ydd/third/common/vo/ResObject.java

@@ -22,5 +22,72 @@ public class ResObject<T> implements Serializable {
         this.msg = msg;
     }
 
+    public ResObject(ResObject.Type type, String msg) {
+        this.code = type.value;
+        this.msg = msg;
+    }
+
+    public ResObject(ResObject.Type type, String msg, T data) {
+        this.code = type.value;
+        this.msg = msg;
+        if (data != null) {
+            this.data = data;
+        }
+    }
+
+    public static <T> ResObject<T> success() {
+        return success("OK");
+    }
+
+    public  static <T> ResObject<T> success(T data) {
+        return success("OK", data);
+    }
+
+    public static <T> ResObject<T> success(String msg) {
+        return success(msg, (T) null);
+    }
+
+    public static <T> ResObject<T> success(String msg, T data) {
+        return new ResObject<T>(ResObject.Type.SUCCESS, msg, data);
+    }
+
+    public static <T> ResObject<T> warn(String msg) {
+        return warn(msg, (T) null);
+    }
+
+    public static <T> ResObject<T> warn(String msg, T data) {
+        return new ResObject<T>(ResObject.Type.WARN, msg, data);
+    }
+
+    public static <T> ResObject<T> error() {
+        return error("操作失败");
+    }
+
+    public static <T> ResObject<T> error(String msg) {
+        return error(msg, (T)null);
+    }
+
+    public static <T> ResObject<T> error(String msg, T data) {
+        return new ResObject<T>(ResObject.Type.ERROR, msg, data);
+    }
+    public static <T> ResObject<T> error(int code,String msg) {
+        return new ResObject<T>(code, msg);
+    }
+
+    public enum Type {
+        SUCCESS(200),
+        WARN(402),
+        ERROR(500);
+
+        private final int value;
+
+        Type(int value) {
+            this.value = value;
+        }
+
+        public int value() {
+            return this.value;
+        }
+    }
 
 }

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/Client.java

@@ -1,6 +1,6 @@
 package com.ydd.third.delivery;
 
-import com.ydd.third.common.exception.BusinessException;
+import com.ydd.common.exception.BusinessException;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
 import com.ydd.third.common.vo.shop.*;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/MeituanClient.java

@@ -1,7 +1,7 @@
 package com.ydd.third.delivery.meituan;
 
 import com.alibaba.fastjson.JSONObject;
-import com.ydd.third.common.exception.BusinessException;
+import com.ydd.common.exception.BusinessException;
 import com.ydd.third.common.utils.AddressLngLatExchanger;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;

lb-third/lb-third-delivery/src/main/java/com/ydd/third/delivery/meituan/service/OrderAddTip.java

@@ -2,7 +2,7 @@ package com.ydd.third.delivery.meituan.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.ydd.third.common.config.DeliveryConfig;
-import com.ydd.third.common.exception.BusinessException;
+import com.ydd.common.exception.BusinessException;
 import com.ydd.third.common.vo.vo.order.OrderTipsVo;
 import com.ydd.third.delivery.meituan.constants.RequestConstant;
 import com.ydd.third.delivery.meituan.request.OrderAddTipRequest;

lb-third/lb-third-print/src/main/java/com/ydd/third/print/feie/service/FePrintService.java

@@ -3,8 +3,7 @@ package com.ydd.third.print.feie.service;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ydd.ecloud.core.enums.StatusEnum;
-import com.ydd.third.common.exception.BusinessException;
+import com.ydd.common.exception.BusinessException;
 import com.ydd.third.print.config.PrintConfig;
 import com.ydd.third.print.feie.resp.FeStatusResp;
 import com.ydd.third.print.feie.utils.HttpClient;

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/Client.java

@@ -1,7 +1,7 @@
 package com.ydd.third.waimai;
 
 import com.alibaba.fastjson.JSONObject;
-import com.ydd.third.common.exception.BusinessException;
+import com.ydd.common.exception.BusinessException;
 import com.ydd.third.common.utils.HttpUtils;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;