| @@ -12,8 +12,8 @@ public enum EnumCarVendor { | |||||
| CAR_JIESHUN(7,"JIESHUN",true),//捷顺老版本,西子用 | CAR_JIESHUN(7,"JIESHUN",true),//捷顺老版本,西子用 | ||||
| CAR_JIESHUN_V2(10,"JIESHUNV2",true),//捷顺通用版本 | CAR_JIESHUN_V2(10,"JIESHUNV2",true),//捷顺通用版本 | ||||
| CAR_HAIKANGWEISHI(8,"HAIKANGWEISHI",true), | CAR_HAIKANGWEISHI(8,"HAIKANGWEISHI",true), | ||||
| CAR_HAIKANGWEISHI_V2(18,"HAIKANGV2",true), | |||||
| CAR_HAIKANGWEISHI_V3(19,"HAIKANGV3",true), | |||||
| CAR_HAIKANGWEISHI_V2(18,"HAIKANGV2",true),//海康威视云部署版本 | |||||
| CAR_HAIKANGWEISHI_V3(19,"HAIKANGV3",true),//海康威视本地部署版本 | |||||
| CAR_FUTE(9,"FUTE",false),//深圳市福特智能科技有限公司 | CAR_FUTE(9,"FUTE",false),//深圳市福特智能科技有限公司 | ||||
| CAR_KETUO(11,"KETUO",false),//科拓停车 | CAR_KETUO(11,"KETUO",false),//科拓停车 | ||||
| CAR_LIFANG(12,"LIFANG",false),// 立方【接口不支持未接通,不能使用】 | CAR_LIFANG(12,"LIFANG",false),// 立方【接口不支持未接通,不能使用】 | ||||
| @@ -186,14 +186,6 @@ public class HaiKangWeiShiV3ParkService extends BaseParkService implements ParkA | |||||
| return new ResultData(ErrorCode.CYF_STOP_FEE_FAIL.getCode(),"当前用户未查询到手机号!"+userCar.getcUserId()); | return new ResultData(ErrorCode.CYF_STOP_FEE_FAIL.getCode(),"当前用户未查询到手机号!"+userCar.getcUserId()); | ||||
| } | } | ||||
| Map<String,String> valueMap = WxParkCouponConfig.parseValue(userCar.getVendorParams()); | |||||
| if (null == valueMap) { | |||||
| return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(),"当前停车券没有关联停车场优惠券配置。"+coupon.getTitle()); | |||||
| } | |||||
| String couponCode = valueMap.get("couponCode"); | |||||
| if (StringUtils.isBlank(couponCode)) { | |||||
| return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(),"当前停车券没有关联停车场优惠券配置[couponCode]。"+coupon.getTitle()); | |||||
| } | |||||
| //查询临停信息,判断缓存是否已经存在 | //查询临停信息,判断缓存是否已经存在 | ||||
| JSONObject stopInfo = haikangV3.getCarStopFee(park, carNumber, getConfig(park),null); | JSONObject stopInfo = haikangV3.getCarStopFee(park, carNumber, getConfig(park),null); | ||||
| String inRecordSyscode = stopInfo.getString("inRecordSyscode"); | String inRecordSyscode = stopInfo.getString("inRecordSyscode"); | ||||