xiaohanzi 5 лет назад
Родитель
Сommit
479fc399c0
4 измененных файлов: 32 добавлений и 32 удалений
  1. +2
    -3
      mallinkService/src/main/java/com/iformall/service/park/impl/bolink/BoLinkParkService.java
  2. +7
    -7
      mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkService.java
  3. +7
    -7
      mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java
  4. +16
    -15
      mallinkService/src/main/java/com/iformall/service/park/impl/tjd/TJDParkService.java

+ 2
- 3
mallinkService/src/main/java/com/iformall/service/park/impl/bolink/BoLinkParkService.java Просмотреть файл

@@ -33,8 +33,7 @@ public class BoLinkParkService extends BaseParkService implements ParkAdapterSer
} }


@Override @Override
public ResultData unbindCar(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) {
return super.defaultUnbindCar(paramMap, park, member);
public void unbindCar(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) {
} }


@Override @Override
@@ -68,7 +67,7 @@ public class BoLinkParkService extends BaseParkService implements ParkAdapterSer
} }


@Override @Override
public ResultData getCoupon(Map<String, String> paramMap, WxPark park, WxCouponOrderCarCVo userCar,WxCoupon coupon,String carNumber) {
public ResultData useCoupon(Map<String, String> paramMap, WxPark park, WxCouponOrderCarCVo userCar,WxCoupon coupon,String carNumber) {
String orderId = paramMap.get("orderId"); String orderId = paramMap.get("orderId");
if (StringUtils.isBlank(orderId)) { if (StringUtils.isBlank(orderId)) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId为空");


+ 7
- 7
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()); private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Override @Override
public ResultData initLogin(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) {
return super.defaultInitLogin(paramMap, park, member);
public String initLogin(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) {
return null;
} }
@Override @Override
public ResultData bindCar(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) {
return super.defaultBindCar(paramMap, park, member);
public String bindCar(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) {
return member.getId().toString();
} }


@Override @Override
public ResultData unbindCar(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) {
return super.defaultUnbindCar(paramMap, park, member);
public void unbindCar(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) {
} }


@Override @Override
@@ -57,7 +57,7 @@ public class DaHuaParkService extends BaseParkService implements ParkAdapterServ
} }


@Override @Override
public ResultData getCoupon(Map<String, String> paramMap, WxPark park, WxCouponOrderCarCVo userCar,WxCoupon coupon,String carNumber) {
public ResultData useCoupon(Map<String, String> paramMap, WxPark park, WxCouponOrderCarCVo userCar,WxCoupon coupon,String carNumber) {
return null; return null;
} }




+ 7
- 7
mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java Просмотреть файл

@@ -32,18 +32,18 @@ public class ShangAnParkService extends BaseParkService implements ParkAdapterSe
@Override @Override
public ResultData initLogin(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) {
return super.defaultInitLogin(paramMap, park, member);
public String initLogin(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) {
return null;
} }
@Override @Override
public ResultData bindCar(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) {
return super.defaultBindCar(paramMap, park, member);
public String bindCar(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) {
return member.getId().toString();
} }


@Override @Override
public ResultData unbindCar(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) {
return super.defaultUnbindCar(paramMap, park, member);
public void unbindCar(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) {
} }


@Override @Override
@@ -53,7 +53,7 @@ public class ShangAnParkService extends BaseParkService implements ParkAdapterSe
} }


@Override @Override
public ResultData getCoupon(Map<String, String> paramMap, WxPark park, WxCouponOrderCarCVo userCar,WxCoupon coupon,String carNumber) {
public ResultData useCoupon(Map<String, String> paramMap, WxPark park, WxCouponOrderCarCVo userCar,WxCoupon coupon,String carNumber) {
String params = park.getVendorParams(); String params = park.getVendorParams();
JSONObject objParams = JSON.parseObject(params); JSONObject objParams = JSON.parseObject(params);
String url = objParams.getString(ShangAnUtil.SHANGAN_URL); String url = objParams.getString(ShangAnUtil.SHANGAN_URL);


+ 16
- 15
mallinkService/src/main/java/com/iformall/service/park/impl/tjd/TJDParkService.java Просмотреть файл

@@ -57,21 +57,21 @@ public class TJDParkService extends BaseParkService implements ParkAdapterServic
@Override @Override
public ResultData initLogin(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) {
return super.defaultInitLogin(paramMap, park, member);
public String initLogin(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) {
return null;
} }
@Override @Override
public ResultData bindCar(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) {
public String bindCar(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) {
return tjdBindCar(paramMap,park,member.getId()); return tjdBindCar(paramMap,park,member.getId());
} }


private ResultData tjdBindCar(Map<String, String> paramMap, WxPark park, Long cuUserId) {
private String tjdBindCar(Map<String, String> paramMap, WxPark park, Long cuUserId) {
String carNumber = paramMap.get("carNumber"); String carNumber = paramMap.get("carNumber");
if (StringUtils.isBlank(carNumber)) { if (StringUtils.isBlank(carNumber)) {
logger.error("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"); String carNumColor = paramMap.get("carNumColor");
//if (StringUtils.isBlank(carNumColor)) { //if (StringUtils.isBlank(carNumColor)) {
@@ -95,13 +95,14 @@ public class TJDParkService extends BaseParkService implements ParkAdapterServic
carNumber, carNumColor, null, outCarId); carNumber, carNumColor, null, outCarId);
JSONObject retObj = JSON.parseObject(ret); JSONObject retObj = JSON.parseObject(ret);
retObj.put("vendor", park.getVendorType()); 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 @Override
public ResultData unbindCar(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) {
return tjdUnbindCar(paramMap,park,member.getId());
public void unbindCar(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) {
tjdUnbindCar(paramMap,park,member.getId());
} }
private ResultData tjdUnbindCar(Map<String, String> paramMap, WxPark park, Long userId) { private ResultData tjdUnbindCar(Map<String, String> paramMap, WxPark park, Long userId) {
@@ -206,7 +207,7 @@ public class TJDParkService extends BaseParkService implements ParkAdapterServic




@Override @Override
public ResultData getCoupon(Map<String, String> paramMap, WxPark park, WxCouponOrderCarCVo userCar,WxCoupon coupon,String carNumber) {
public ResultData useCoupon(Map<String, String> paramMap, WxPark park, WxCouponOrderCarCVo userCar,WxCoupon coupon,String carNumber) {
String tradeId = paramMap.get("tradeId"); String tradeId = paramMap.get("tradeId");
String accountId = paramMap.get("accountId"); String accountId = paramMap.get("accountId");
if (StringUtils.isBlank(tradeId)) { if (StringUtils.isBlank(tradeId)) {


Загрузка…
Отмена
Сохранить