From 71190b8f41e932f3d6bf5a36e97d5ede9f0571c9 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 16 Jan 2019 15:56:20 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=81=9C=E8=BD=A6=E5=9C=BA=E7=8A=B6=E6=80=81]?= =?UTF-8?q?[=E4=BF=AE=E6=94=B9]:=E5=8F=82=E6=95=B0=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/controller/WxCarController.java | 5 ++++- .../main/java/com/iformall/controller/WxCarController.java | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java index 7046e2628..9e63b0d42 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java @@ -282,12 +282,16 @@ public class WxCarController extends BaseController { WxPark park = getCurrentPark(user); if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { String params = park.getVendorParams(); + if(params == null) { + return new ResultData(ErrorCode.CAR_VENDOR_NOT_SUPPORT.getCode(), "车场不支持"); + } JSONObject objParams = JSON.parseObject(params); String url = objParams.getString("url"); String merchantNo = objParams.getString("merchantNo"); String merchantKey = objParams.getString("merchantKey"); String version = objParams.getString("version"); if (park.getParkingId() == null) { + // those code is not supported String lat = objParams.getString("lat"); String lon = objParams.getString("lon"); String radius = objParams.getString("radius"); @@ -315,7 +319,6 @@ public class WxCarController extends BaseController { if (park.getParkingId() != null) { String ret = etcp.parkingStatus(url, merchantNo, merchantKey, version, park.getParkingId()); - JSONObject retObj = JSON.parseObject(ret); if (retObj.getIntValue("code") == EnumETCPCode.SUCCESS.getCode()) { if (retObj.get("data") != null) { diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index 57c88ede9..9f9ebda3f 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -729,12 +729,16 @@ public class WxCarController extends BaseController { WxPark park = getCurrentPark(user); if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { String params = park.getVendorParams(); + if(params == null) { + return new ResultData(ErrorCode.CAR_VENDOR_NOT_SUPPORT.getCode(), "车场不支持"); + } JSONObject objParams = JSON.parseObject(params); String url = objParams.getString("url"); String merchantNo = objParams.getString("merchantNo"); String merchantKey = objParams.getString("merchantKey"); String version = objParams.getString("version"); if (park.getParkingId() == null) { + // those code is not supported String lat = objParams.getString("lat"); String lon = objParams.getString("lon"); String radius = objParams.getString("radius");