diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java index 20e8f583d..ecb31ea83 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java @@ -15,6 +15,7 @@ import com.alibaba.fastjson.JSONObject; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCUserBasicInfo; +import com.iformall.domain.po.WxCUserCar; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxPark; import com.iformall.domain.vo.WxCouponOrderCarCVo; @@ -39,6 +40,15 @@ public class CYFParkService extends BaseParkService implements ParkAdapterServic @Override public String initLogin(Map paramMap, WxPark park, WxCUserBasicInfo member) throws Exception{ + String carNumber = paramMap.get("carNumber"); + if (StringUtils.isBlank(carNumber)) { + logger.error("carNumber为空"); + throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "carNumber为空"); + } + WxCUserCar car = parkHelper.getOne(park, member.getId(), carNumber, EnumCarVendor.CAE_CYF); + if (null != car) { + return car.getVendorPersonId(); + } return null; } diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java b/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java index 5f545ed01..67fb7f354 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java @@ -40,6 +40,15 @@ public class ParkHelper { @Autowired WxCreditHistoryService wxCreditHistoryService; + public WxCUserCar getOne(WxPark park, Long cuUserId,String carNumber,EnumCarVendor carVendor) { + WxCUserCar userCar = new WxCUserCar(); + userCar.updateTenantInfo(park); + userCar.setCUserId(cuUserId); + userCar.setCarNumber(carNumber); + userCar.setVendorType(carVendor.getCode()); + return wxCUserCarService.getOne(userCar); + } + public ResultData bindCar(Map paramMap, WxPark park, Long cuUserId,String vendorPersonId) { String carNumber = paramMap.get("carNumber"); if (StringUtils.isBlank(carNumber)) { @@ -53,7 +62,7 @@ public class ParkHelper { } catch (Exception e) { return new ResultData(500, e.getMessage()); } - return new ResultData(); + return new ResultData(vendorPersonId); } public void addCarInfoToDB(String carNumber, EnumCarVendor carVendor, WxPark park, Long cuUserId,String vendorPersonId) {