From 980f7b588616c4e5a3817f8e8aeacf640cf284f5 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sun, 23 Aug 2020 13:37:23 +0800 Subject: [PATCH] fix park --- .../park/impl/bolink/BoLinkParkService.java | 2 +- .../park/impl/cyf/CYFParkCallbackService.java | 25 ++++++++++++++++--- .../park/impl/dahua/DaHuaParkService.java | 4 +-- .../park/impl/shangan/ShangAnParkService.java | 3 +-- .../service/park/impl/tjd/TJDParkService.java | 19 ++++++++------ 5 files changed, 38 insertions(+), 15 deletions(-) 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 985cba6ec..94c0ce7c0 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 @@ -29,7 +29,7 @@ public class BoLinkParkService extends BaseParkService implements ParkAdapterSer @Override public String bindCar(Map paramMap, WxPark park, WxCUserBasicInfo member) { - return null; + return member.getId().toString(); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkCallbackService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkCallbackService.java index 06dfed669..6977c5133 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkCallbackService.java +++ b/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 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 79450e72d..26504b4ac 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 @@ -58,13 +58,13 @@ public class DaHuaParkService extends BaseParkService implements ParkAdapterServ @Override public ResultData useCoupon(Map 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(); } } 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 fed0f3953..8f0a6477e 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 @@ -48,8 +48,7 @@ public class ShangAnParkService extends BaseParkService implements ParkAdapterSe @Override public ResultData carStopFee(Map paramMap, WxPark park) { - // TODO Auto-generated method stub - return null; + return new ResultData(); } @Override 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 b0d3c6684..4abf1bf5f 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 @@ -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 {