| @@ -81,9 +81,14 @@ public class WxCarController extends BaseController | |||||
| // 2. get vendor params | // 2. get vendor params | ||||
| if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { | if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { | ||||
| String phone = paramMap.get("phone"); | String phone = paramMap.get("phone"); | ||||
| if (StringUtils.isBlank(phone)) { | |||||
| logger.error("手机号为空"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "phone为空"); | |||||
| if (StringUtils.isBlank(phone) && StringUtils.isBlank(user.getPhone()) && StringUtils.isBlank(user.getVerifyCodePhone())) { | |||||
| logger.error("手机号为空,请授权手机号"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); | |||||
| } | |||||
| if (!StringUtils.isBlank(user.getPhone()) && !user.getPhone().contains("*")) { | |||||
| phone = user.getPhone(); | |||||
| } else { | |||||
| phone = user.getVerifyCodePhone(); | |||||
| } | } | ||||
| String params = park.getVendorParams(); | String params = park.getVendorParams(); | ||||
| JSONObject objParams = JSON.parseObject(params); | JSONObject objParams = JSON.parseObject(params); | ||||
| @@ -100,9 +105,9 @@ public class WxCarController extends BaseController | |||||
| JSONObject dataObj = retObj.getJSONObject("data"); | JSONObject dataObj = retObj.getJSONObject("data"); | ||||
| dataObj.put("vendor", EnumCarVendor.CAR_ETCP.getCode()); | dataObj.put("vendor", EnumCarVendor.CAR_ETCP.getCode()); | ||||
| String etcpToken = dataObj.getString("token"); | 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 | // c端必须保存此token | ||||
| return new ResultData(dataObj); | return new ResultData(dataObj); | ||||
| } else { | } else { | ||||
| @@ -213,7 +218,7 @@ public class WxCarController extends BaseController | |||||
| " \"carId\": \"5836b8b52ada463ebc6199579f029561\"\n" + | " \"carId\": \"5836b8b52ada463ebc6199579f029561\"\n" + | ||||
| "}\n") | "}\n") | ||||
| @PostMapping("/bindCar") | @PostMapping("/bindCar") | ||||
| public ResultData bindCar(Map<String, String > paramMap) { | |||||
| public ResultData bindCar(@RequestBody Map<String, String > paramMap) { | |||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| // 1, get mall's park | // 1, get mall's park | ||||
| WxPark park = getCurrentPark(user); | WxPark park = getCurrentPark(user); | ||||
| @@ -253,8 +258,9 @@ public class WxCarController extends BaseController | |||||
| dataObj.put("vendor", park.getVendorType()); | dataObj.put("vendor", park.getVendorType()); | ||||
| return new ResultData(dataObj); | return new ResultData(dataObj); | ||||
| } else { | } else { | ||||
| String message = retObj.getString("message"); | |||||
| logger.error("绑车牌失败: " + carNumber); | logger.error("绑车牌失败: " + carNumber); | ||||
| return new ResultData(ErrorCode.ETCP_BIND_FAIL.getCode(), "绑车牌失败"); | |||||
| return new ResultData(ErrorCode.ETCP_BIND_FAIL.getCode(), message, retObj); | |||||
| } | } | ||||
| } | } | ||||
| else if (park.getVendorType() == EnumCarVendor.CAR_TJD.getCode()) { | else if (park.getVendorType() == EnumCarVendor.CAR_TJD.getCode()) { | ||||