|
|
|
@@ -98,19 +98,22 @@ public class WxCarController extends BaseController |
|
|
|
if (retObj.getIntValue("code") == EnumETCPCode.SUCCESS.getCode()) { |
|
|
|
// 获取绑定的车牌 |
|
|
|
JSONObject dataObj = retObj.getJSONObject("data"); |
|
|
|
dataObj.put("vendor", EnumCarVendor.CAR_ETCP.getCode()); |
|
|
|
String etcpToken = dataObj.getString("token"); |
|
|
|
JSONObject dataObj1 = syncCarNumbers(user.getId(), user.getTenantId(), park.getVendorType(), |
|
|
|
url, merchantNo, merchantKey, version, |
|
|
|
etcpToken); |
|
|
|
//JSONObject dataObj1 = syncCarNumbers(user.getId(), user.getTenantId(), park.getVendorType(), |
|
|
|
// url, merchantNo, merchantKey, version, |
|
|
|
// etcpToken); |
|
|
|
// c端必须保存此token |
|
|
|
return new ResultData(dataObj1); |
|
|
|
return new ResultData(dataObj); |
|
|
|
} else { |
|
|
|
logger.error("共同登录失败: "+phone); |
|
|
|
return new ResultData(ErrorCode.ETCP_LOGIN_FAIL.getCode(), "共同登录失败"); |
|
|
|
} |
|
|
|
} else if (park.getVendorType() == EnumCarVendor.CAR_TJD.getCode()){ |
|
|
|
// TJD不需要共同登录 |
|
|
|
return new ResultData(); |
|
|
|
Map resultMap = new HashMap(); |
|
|
|
resultMap.put("vendor", EnumCarVendor.CAR_TJD.getCode()); |
|
|
|
return new ResultData(resultMap); |
|
|
|
} |
|
|
|
|
|
|
|
return new ResultData(ErrorCode.CAR_VENDOR_NOT_SUPPORT.getCode(), "登录失败"); |
|
|
|
|