diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/bolink/BoLinkParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/bolink/BoLinkParkService.java index 77376847b..985cba6ec 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/bolink/BoLinkParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/bolink/BoLinkParkService.java @@ -33,8 +33,7 @@ public class BoLinkParkService extends BaseParkService implements ParkAdapterSer } @Override - public ResultData unbindCar(Map paramMap, WxPark park, WxCUserBasicInfo member) { - return super.defaultUnbindCar(paramMap, park, member); + public void unbindCar(Map paramMap, WxPark park, WxCUserBasicInfo member) { } @Override @@ -68,7 +67,7 @@ public class BoLinkParkService extends BaseParkService implements ParkAdapterSer } @Override - public ResultData getCoupon(Map paramMap, WxPark park, WxCouponOrderCarCVo userCar,WxCoupon coupon,String carNumber) { + public ResultData useCoupon(Map paramMap, WxPark park, WxCouponOrderCarCVo userCar,WxCoupon coupon,String carNumber) { String orderId = paramMap.get("orderId"); if (StringUtils.isBlank(orderId)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId为空"); diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkService.java index eb8ede07c..79450e72d 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkService.java @@ -23,19 +23,19 @@ public class DaHuaParkService extends BaseParkService implements ParkAdapterServ private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Override - public ResultData initLogin(Map paramMap, WxPark park, WxCUserBasicInfo member) { - return super.defaultInitLogin(paramMap, park, member); + public String initLogin(Map paramMap, WxPark park, WxCUserBasicInfo member) { + return null; } @Override - public ResultData bindCar(Map paramMap, WxPark park, WxCUserBasicInfo member) { - return super.defaultBindCar(paramMap, park, member); + public String bindCar(Map paramMap, WxPark park, WxCUserBasicInfo member) { + return member.getId().toString(); } @Override - public ResultData unbindCar(Map paramMap, WxPark park, WxCUserBasicInfo member) { - return super.defaultUnbindCar(paramMap, park, member); + public void unbindCar(Map paramMap, WxPark park, WxCUserBasicInfo member) { + } @Override @@ -57,7 +57,7 @@ public class DaHuaParkService extends BaseParkService implements ParkAdapterServ } @Override - public ResultData getCoupon(Map paramMap, WxPark park, WxCouponOrderCarCVo userCar,WxCoupon coupon,String carNumber) { + public ResultData useCoupon(Map paramMap, WxPark park, WxCouponOrderCarCVo userCar,WxCoupon coupon,String carNumber) { return null; } diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java index 78f1832ec..fed0f3953 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java @@ -32,18 +32,18 @@ public class ShangAnParkService extends BaseParkService implements ParkAdapterSe @Override - public ResultData initLogin(Map paramMap, WxPark park, WxCUserBasicInfo member) { - return super.defaultInitLogin(paramMap, park, member); + public String initLogin(Map paramMap, WxPark park, WxCUserBasicInfo member) { + return null; } @Override - public ResultData bindCar(Map paramMap, WxPark park, WxCUserBasicInfo member) { - return super.defaultBindCar(paramMap, park, member); + public String bindCar(Map paramMap, WxPark park, WxCUserBasicInfo member) { + return member.getId().toString(); } @Override - public ResultData unbindCar(Map paramMap, WxPark park, WxCUserBasicInfo member) { - return super.defaultUnbindCar(paramMap, park, member); + public void unbindCar(Map paramMap, WxPark park, WxCUserBasicInfo member) { + } @Override @@ -53,7 +53,7 @@ public class ShangAnParkService extends BaseParkService implements ParkAdapterSe } @Override - public ResultData getCoupon(Map paramMap, WxPark park, WxCouponOrderCarCVo userCar,WxCoupon coupon,String carNumber) { + public ResultData useCoupon(Map paramMap, WxPark park, WxCouponOrderCarCVo userCar,WxCoupon coupon,String carNumber) { String params = park.getVendorParams(); JSONObject objParams = JSON.parseObject(params); String url = objParams.getString(ShangAnUtil.SHANGAN_URL); diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/tjd/TJDParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/tjd/TJDParkService.java index 6ca194114..b0d3c6684 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/tjd/TJDParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/tjd/TJDParkService.java @@ -57,21 +57,21 @@ public class TJDParkService extends BaseParkService implements ParkAdapterServic @Override - public ResultData initLogin(Map paramMap, WxPark park, WxCUserBasicInfo member) { - return super.defaultInitLogin(paramMap, park, member); + public String initLogin(Map paramMap, WxPark park, WxCUserBasicInfo member) { + return null; } @Override - public ResultData bindCar(Map paramMap, WxPark park, WxCUserBasicInfo member) { + public String bindCar(Map paramMap, WxPark park, WxCUserBasicInfo member) { return tjdBindCar(paramMap,park,member.getId()); } - private ResultData tjdBindCar(Map paramMap, WxPark park, Long cuUserId) { + private String tjdBindCar(Map paramMap, WxPark park, Long cuUserId) { String carNumber = paramMap.get("carNumber"); if (StringUtils.isBlank(carNumber)) { logger.error("carNumber为空"); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "carNumber为空"); + //return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "carNumber为空"); } String carNumColor = paramMap.get("carNumColor"); //if (StringUtils.isBlank(carNumColor)) { @@ -95,13 +95,14 @@ public class TJDParkService extends BaseParkService implements ParkAdapterServic carNumber, carNumColor, null, outCarId); JSONObject retObj = JSON.parseObject(ret); retObj.put("vendor", park.getVendorType()); - if (retObj.getString("returnCode").equalsIgnoreCase(EnumTJDCode.SUCCESS.getMessage())) { - ResultData e = tjdInsertToDB(carNumber, newCarId, retObj, park, cuUserId); - if (e != null) return e; - return new ResultData(retObj); - } else { - return new ResultData(ErrorCode.CAR_BIND_FAIL.getCode(), "绑车牌失败", retObj); - } +// if (retObj.getString("returnCode").equalsIgnoreCase(EnumTJDCode.SUCCESS.getMessage())) { +// ResultData e = tjdInsertToDB(carNumber, newCarId, retObj, park, cuUserId); +// if (e != null) return e; +// return new ResultData(retObj); +// } else { +// return new ResultData(ErrorCode.CAR_BIND_FAIL.getCode(), "绑车牌失败", retObj); +// } + return null; } @@ -136,8 +137,8 @@ public class TJDParkService extends BaseParkService implements ParkAdapterServic @Override - public ResultData unbindCar(Map paramMap, WxPark park, WxCUserBasicInfo member) { - return tjdUnbindCar(paramMap,park,member.getId()); + public void unbindCar(Map paramMap, WxPark park, WxCUserBasicInfo member) { + tjdUnbindCar(paramMap,park,member.getId()); } private ResultData tjdUnbindCar(Map paramMap, WxPark park, Long userId) { @@ -206,7 +207,7 @@ public class TJDParkService extends BaseParkService implements ParkAdapterServic @Override - public ResultData getCoupon(Map paramMap, WxPark park, WxCouponOrderCarCVo userCar,WxCoupon coupon,String carNumber) { + public ResultData useCoupon(Map paramMap, WxPark park, WxCouponOrderCarCVo userCar,WxCoupon coupon,String carNumber) { String tradeId = paramMap.get("tradeId"); String accountId = paramMap.get("accountId"); if (StringUtils.isBlank(tradeId)) {