diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index e3f68aeaf..9c9c681f4 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -101,17 +101,14 @@ public class WxCarController extends BaseController { // 2. get vendor params if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) { return initForEtcp(paramMap, user, park); - } else if (park.getVendorType().equals(EnumCarVendor.CAR_TJD.getCode())) { - // TJD不需要共同登录 + } else if (park.getVendorType().equals(EnumCarVendor.CAR_TJD.getCode()) || + park.getVendorType().equals(EnumCarVendor.CAR_DAHUA.getCode()) || + park.getVendorType().equals(EnumCarVendor.CAR_SHANGAN.getCode()) || + park.getVendorType().equals(EnumCarVendor.CAR_BOLINK.getCode())) { Map resultMap = new HashMap(); - resultMap.put("vendor", EnumCarVendor.CAR_TJD.getCode()); - return new ResultData(resultMap); - } else if (park.getVendorType().equals(EnumCarVendor.CAR_DAHUA.getCode())) { - Map resultMap = new HashMap(); - resultMap.put("vendor", EnumCarVendor.CAR_DAHUA.getCode()); + resultMap.put("vendor", park.getVendorType()); return new ResultData(resultMap); } - return new ResultData(ErrorCode.CAR_VENDOR_NOT_SUPPORT.getCode(), "登录失败"); }