|
|
|
@@ -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) { |
|
|
|
|