From 4a103de0ebc8365f6547f42fd6e2fdcaf8b0905e Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 24 Aug 2018 15:55:38 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=BD=A6=E6=B5=81][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E8=BD=A6=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxCarController.java | 13 ++++++---- .../controller/WxUserGrantController.java | 25 ++++++++++++++++++- .../com/simple/service/WxCUserCarService.java | 8 ++++++ .../service/impl/WxCUserCarServiceImpl.java | 5 ++++ 4 files changed, 45 insertions(+), 6 deletions(-) diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java index 1c0882d91..39fe96dec 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java @@ -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(), "登录失败"); diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/simple/controller/WxUserGrantController.java index d4104f7c7..88e22ca76 100755 --- a/mallinkCApi/src/main/java/com/simple/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxUserGrantController.java @@ -282,8 +282,31 @@ public class WxUserGrantController extends BaseController { 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("获取当前用户车牌列表") - @GetMapping("/carlist") + @GetMapping("/carList") public ResultData getCarList() { WxCUser user = getUser(); WxCUserCar userCar = new WxCUserCar(); diff --git a/mallinkService/src/main/java/com/simple/service/WxCUserCarService.java b/mallinkService/src/main/java/com/simple/service/WxCUserCarService.java index f5fa6c2ae..604f7302c 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCUserCarService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCUserCarService.java @@ -25,6 +25,14 @@ public interface WxCUserCarService { */ List getList(WxCUserCar record); + /** + * 根据实体查询count + * + * @param record + * @return + */ + Integer countUserCar(WxCUserCar record); + /** * 根据实体查询 * diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarServiceImpl.java index 2cbd529f2..b38485901 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarServiceImpl.java @@ -27,6 +27,11 @@ public class WxCUserCarServiceImpl implements WxCUserCarService { return wxCUserCarMapper.findList(record); } + @Override + public Integer countUserCar(WxCUserCar record) { + return wxCUserCarMapper.selectCount(record); + } + @Override public WxCUserCar getOne(WxCUserCar record) { List userCarList = wxCUserCarMapper.findList(record);