diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 839179931..516793d3b 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -156,10 +156,12 @@ public enum ErrorCode{ TJD_STOP_FEE_FAIL(2062, "TJD停车费失败"), TJD_DEDUCE_FEE_FAIL(2063, "TJD停车费抵扣失败"), - SHANGAN_COUPON_FAIL(2070, "优惠券失败"), + SHANGAN_COUPON_FAIL(2065, "优惠券失败"), + SHANGAN_CMD_FAIL(2066, "尚安网络异常"), - BOLINK_SIGN_ERR(2071, "泊链签名错误"), - BOLINK_STOP_FEE_FAIL(2072, "泊链停车费获取失败"), + BOLINK_SIGN_ERR(2068, "泊链签名错误"), + BOLINK_STOP_FEE_FAIL(2069, "泊链停车费获取失败"), + BOLINK_CMD_FAIL(2066, "泊链网络异常"), /** diff --git a/mallinkService/src/main/java/com/iformall/utils/car/BoLinkUtil.java b/mallinkService/src/main/java/com/iformall/utils/car/BoLinkUtil.java index 64fb984b7..fc9a90f64 100644 --- a/mallinkService/src/main/java/com/iformall/utils/car/BoLinkUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/car/BoLinkUtil.java @@ -94,6 +94,13 @@ public class BoLinkUtil { return signValue; } + public static boolean checkRespFailed(String resp) { + if(resp.startsWith("") || resp.startsWith("")) { + return true; + } + return false; + } + public static String getStopFee(String url, String comid, String unionId, String key, String carNumber) { Map params = new HashMap<>(); params.put(BOLINK_COMID, comid); @@ -107,6 +114,12 @@ public class BoLinkUtil { try { String result = Proc(url, key, params); + if(result == null) { + throw new MallinkException(ErrorCode.BOLINK_CMD_FAIL); + } + if(checkRespFailed(result)) { + throw new MallinkException(ErrorCode.BOLINK_CMD_FAIL); + } return result; } catch (Exception e) { return null; diff --git a/mallinkService/src/main/java/com/iformall/utils/car/ShangAnUtil.java b/mallinkService/src/main/java/com/iformall/utils/car/ShangAnUtil.java index a81826dce..0fd670dd3 100644 --- a/mallinkService/src/main/java/com/iformall/utils/car/ShangAnUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/car/ShangAnUtil.java @@ -2,6 +2,8 @@ package com.iformall.utils.car; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.iformall.common.ErrorCode; +import com.iformall.exception.MallinkException; import com.iformall.utils.DateUtils; import org.apache.http.Consts; import org.apache.http.HttpEntity; @@ -92,6 +94,13 @@ public class ShangAnUtil { return signValue; } + public static boolean checkRespFailed(String resp) { + if(resp.startsWith("") || resp.startsWith("")) { + return true; + } + return false; + } + public static String couponSend(String url, String key, String parkNumber, String couponModelId, Date expireTime, String plate, String position) { Map params = new HashMap<>(); params.put("parkNum", parkNumber); @@ -101,6 +110,12 @@ public class ShangAnUtil { params.put("position", position); try { String result = Proc(url, key, parkNumber, params); + if(result == null) { + throw new MallinkException(ErrorCode.ETCP_CMD_FAIL); + } + if(checkRespFailed(result)) { + throw new MallinkException(ErrorCode.ETCP_CMD_FAIL); + } return result; } catch (Exception e) { return null;