Просмотр исходного кода

fix park

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

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

@@ -29,7 +29,7 @@ public class BoLinkParkService extends BaseParkService implements ParkAdapterSer
@Override
public String bindCar(Map<String, String> paramMap, WxPark park, WxCUserBasicInfo member) {
return null;
return member.getId().toString();
}

@Override


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

@@ -5,10 +5,12 @@ import java.util.Map;

import org.springframework.stereotype.Service;

import com.iformall.domain.vo.WxCarCYFVo;
import com.iformall.service.park.ParkCallBackAdapterService;
import com.iformall.service.park.entity.ParkNotifyParam;
import com.iformall.service.park.impl.BaseParkService;
import com.iformall.utils.car.CYFUtil;
import com.iformall.utils.car.TJDUtil;

import lombok.extern.slf4j.Slf4j;

@@ -33,7 +35,6 @@ public class CYFParkCallbackService extends BaseParkService implements ParkCallB
try {
p.setEntranceTime(CYFUtil.utcToLocal(entranceTime));
} catch (ParseException e) {
e.printStackTrace();
log.error("cyf entranceTime format error",e);
return null;
}
@@ -42,8 +43,26 @@ public class CYFParkCallbackService extends BaseParkService implements ParkCallB

@Override
public ParkNotifyParam parseOutNoticyParam(Object param) {
return null;
WxCarCYFVo vo = (WxCarCYFVo) param;
ParkNotifyParam p = new ParkNotifyParam();
p.setCarNumber(vo.getPlate());
p.setParkId(String.valueOf(vo.getParkingId()));
p.setParkName(vo.getRecordOrderId());
p.setSynId(vo.getRecordOrderId());
try {
p.setEntranceTime(TJDUtil.dateOutFormat.parse(vo.getInInfo().getTime()));
} catch (ParseException e) {
log.error("cyf entranceTime format error",e);
return null;
}
try {
p.setOutTime(TJDUtil.dateOutFormat.parse(vo.getOutInfo().getTime()));
} catch (ParseException e) {
log.error("cyf outTime format error",e);
return null;
}
p.setFee(String.valueOf(vo.getPayInfoList().getActualFee()));
return p;
}

@Override


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

@@ -58,13 +58,13 @@ public class DaHuaParkService extends BaseParkService implements ParkAdapterServ

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


@Override
public ResultData getParkStatus(WxPark park) {
return null;
return new ResultData();
}

}

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

@@ -48,8 +48,7 @@ public class ShangAnParkService extends BaseParkService implements ParkAdapterSe

@Override
public ResultData carStopFee(Map<String, String> paramMap, WxPark park) {
// TODO Auto-generated method stub
return null;
return new ResultData();
}

@Override


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

@@ -24,6 +24,7 @@ import com.iformall.enums.EnumCarVendor;
import com.iformall.enums.EnumCouponUnit;
import com.iformall.enums.EnumScoreType;
import com.iformall.enums.EnumTJDCode;
import com.iformall.exception.MallinkException;
import com.iformall.service.WxCUserCarService;
import com.iformall.service.WxCUserTagsService;
import com.iformall.service.WxCouponService;
@@ -95,6 +96,11 @@ 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())) {
return String.valueOf(newCarId);
}else {
throw new MallinkException(ErrorCode.CAR_BIND_FAIL.getCode(), "绑车牌失败");
}
// if (retObj.getString("returnCode").equalsIgnoreCase(EnumTJDCode.SUCCESS.getMessage())) {
// ResultData e = tjdInsertToDB(carNumber, newCarId, retObj, park, cuUserId);
// if (e != null) return e;
@@ -102,7 +108,6 @@ public class TJDParkService extends BaseParkService implements ParkAdapterServic
// } else {
// return new ResultData(ErrorCode.CAR_BIND_FAIL.getCode(), "绑车牌失败", retObj);
// }
return null;
}


@@ -164,12 +169,12 @@ public class TJDParkService extends BaseParkService implements ParkAdapterServic
String ret = tjd.writeOffCar(url, partner, key, version, carId);
JSONObject retObj = JSON.parseObject(ret);
if (retObj.getString("returnCode").equalsIgnoreCase(EnumTJDCode.SUCCESS.getMessage())) {
try {
wxCUserCarService.deleteByObj(userCar);
} catch (Exception e) {
logger.error("解绑车牌数据库错误, e:" + e.getMessage());
return new ResultData(ErrorCode.DB_FAIL.getCode(), "解绑车牌数据库错误, e:" + e.getMessage());
}
// try {
// wxCUserCarService.deleteByObj(userCar);
// } catch (Exception e) {
// logger.error("解绑车牌数据库错误, e:" + e.getMessage());
// return new ResultData(ErrorCode.DB_FAIL.getCode(), "解绑车牌数据库错误, e:" + e.getMessage());
// }

return new ResultData();
} else {


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