From 7c657adfa56fb98b7d5dc50a04ab7c1a6016440c Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 7 Nov 2019 11:13:59 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=9B=86=E5=9B=A2=E7=89=88][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/controller/WxCarController.java | 4 ++-- .../java/com/iformall/controller/WxUserGrantController.java | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index 11cda0e64..6a4dab76d 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -262,10 +262,10 @@ public class WxCarController extends BaseController { WxPark park = getCurrentPark(getTenantInfo()); // 2. get vendor params if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { - return etcpBindCar(paramMap, park); + return etcpBindCar(paramMap, park, getUserId()); } else { // 内部操作 - return bindCar(paramMap, park); + return bindCar(paramMap, park, getUserId()); } } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 160b07bfb..bab3ac522 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -161,6 +161,9 @@ public class WxUserGrantController extends BaseController { if (wxAuthorizerInfo == null) { return new ResultData(ErrorCode.APP_ID_NOT_FOUND); } + if (!wxAuthorizerInfo.getEnable().equals(EnumEnableType.Enable.getCode())) { + return new ResultData(ErrorCode.APP_ID_NOT_ENABLE); + } // 集团版,获取子集团list List mallList = null; if (wxAuthorizerInfo.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) { @@ -175,6 +178,9 @@ public class WxUserGrantController extends BaseController { if (wxAppinfo == null) { return new ResultData(ErrorCode.APP_ID_NOT_FOUND); } + if (!wxAppinfo.getEnable().equals(EnumEnableType.Enable.getCode())) { + return new ResultData(ErrorCode.APP_ID_NOT_ENABLE); + } wxMaService = getWeappServiceByAppInfo(wxAppinfo); if (StringUtils.isBlank(wxAppinfo.getAccessToken())) {