From 9878c01ac06dc9906575a895c54ca1c339c6c299 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 19 Nov 2020 01:35:47 +0800 Subject: [PATCH] fix bug --- .../main/java/com/iformall/controller/WxCarController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index 0ce2a8efb..66cb2e5d3 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -113,6 +113,9 @@ public class WxCarController extends BaseController { } catch (Exception e) { return new ResultData(Result.ERROR,e.getMessage()); } + if (null == park) { + return new ResultData(Result.ERROR,"当前租户park不支持"); + } if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) { return etcpHelper.initForEtcp(paramMap, memberId, park); }else { @@ -390,7 +393,7 @@ public class WxCarController extends BaseController { public ResultData getParkStatus() { /// 1, get mall's park WxPark park = getCurrentPark(getTenantInfo()); - if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { + if (null != park && park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { ResultData e = etcpHelper.etcpParkStatus(park); if (e != null) return e; }