| @@ -98,19 +98,22 @@ public class WxCarController extends BaseController | |||||
| if (retObj.getIntValue("code") == EnumETCPCode.SUCCESS.getCode()) { | if (retObj.getIntValue("code") == EnumETCPCode.SUCCESS.getCode()) { | ||||
| // 获取绑定的车牌 | // 获取绑定的车牌 | ||||
| JSONObject dataObj = retObj.getJSONObject("data"); | JSONObject dataObj = retObj.getJSONObject("data"); | ||||
| 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(dataObj1); | |||||
| return new ResultData(dataObj); | |||||
| } else { | } else { | ||||
| logger.error("共同登录失败: "+phone); | logger.error("共同登录失败: "+phone); | ||||
| return new ResultData(ErrorCode.ETCP_LOGIN_FAIL.getCode(), "共同登录失败"); | return new ResultData(ErrorCode.ETCP_LOGIN_FAIL.getCode(), "共同登录失败"); | ||||
| } | } | ||||
| } else if (park.getVendorType() == EnumCarVendor.CAR_TJD.getCode()){ | } else if (park.getVendorType() == EnumCarVendor.CAR_TJD.getCode()){ | ||||
| // TJD不需要共同登录 | // 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(), "登录失败"); | return new ResultData(ErrorCode.CAR_VENDOR_NOT_SUPPORT.getCode(), "登录失败"); | ||||
| @@ -282,8 +282,31 @@ public class WxUserGrantController extends BaseController { | |||||
| return new ResultData(Result.SUCCESS,"查询成功",user); | return new ResultData(Result.SUCCESS,"查询成功",user); | ||||
| } | } | ||||
| @ApiOperation("当前用户名下是否有车") | |||||
| @GetMapping("/carCount") | |||||
| public ResultData carCount() { | |||||
| WxCUser user = getUser(); | |||||
| WxCUserCar userCar = new WxCUserCar(); | |||||
| userCar.setTenantId(user.getTenantId()); | |||||
| userCar.setCUserId(user.getId()); | |||||
| Integer count = wxCUserCarService.countUserCar(userCar); | |||||
| if (count > 0) { | |||||
| Map returnMap = new HashMap(); | |||||
| String phone = user.getPhone(); | |||||
| if (phone.contains("*")) | |||||
| phone = user.getVerifyCodePhone(); | |||||
| returnMap.put("phone", phone); | |||||
| returnMap.put("count", count); | |||||
| return new ResultData(Result.SUCCESS,"count获取成功", returnMap); | |||||
| } else { | |||||
| Map returnMap = new HashMap(); | |||||
| returnMap.put("count", count); | |||||
| return new ResultData(Result.SUCCESS,"count获取成功", returnMap); | |||||
| } | |||||
| } | |||||
| @ApiOperation("获取当前用户车牌列表") | @ApiOperation("获取当前用户车牌列表") | ||||
| @GetMapping("/carlist") | |||||
| @GetMapping("/carList") | |||||
| public ResultData getCarList() { | public ResultData getCarList() { | ||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| WxCUserCar userCar = new WxCUserCar(); | WxCUserCar userCar = new WxCUserCar(); | ||||
| @@ -25,6 +25,14 @@ public interface WxCUserCarService { | |||||
| */ | */ | ||||
| List<WxCUserCar> getList(WxCUserCar record); | List<WxCUserCar> getList(WxCUserCar record); | ||||
| /** | |||||
| * 根据实体查询count | |||||
| * | |||||
| * @param record | |||||
| * @return | |||||
| */ | |||||
| Integer countUserCar(WxCUserCar record); | |||||
| /** | /** | ||||
| * 根据实体查询 | * 根据实体查询 | ||||
| * | * | ||||
| @@ -27,6 +27,11 @@ public class WxCUserCarServiceImpl implements WxCUserCarService { | |||||
| return wxCUserCarMapper.findList(record); | return wxCUserCarMapper.findList(record); | ||||
| } | } | ||||
| @Override | |||||
| public Integer countUserCar(WxCUserCar record) { | |||||
| return wxCUserCarMapper.selectCount(record); | |||||
| } | |||||
| @Override | @Override | ||||
| public WxCUserCar getOne(WxCUserCar record) { | public WxCUserCar getOne(WxCUserCar record) { | ||||
| List<WxCUserCar> userCarList = wxCUserCarMapper.findList(record); | List<WxCUserCar> userCarList = wxCUserCarMapper.findList(record); | ||||