diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java index 644331a5d..b1454a31f 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java @@ -91,7 +91,7 @@ public class WxCarJieShunCallBackController extends WxParkCallBackBaseController @PostMapping(value = "/parkOut") public Result parkOutCallback(@RequestBody Map paramMap) { log.info("["+getIpAddr()+"] jieshunCarCallback parkOut: " + paramMap.toString()); - return super.parkOutCallBack(EnumCarVendor.CAE_CYF, EnumCarCmd.CAR_JIESHUN_CALLBACK_PARK_OUT, paramMap); + return super.parkOutCallBack(EnumCarVendor.CAR_JIESHUN, EnumCarCmd.CAR_JIESHUN_CALLBACK_PARK_OUT, paramMap); } diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java index fa393b643..d07f66706 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java @@ -172,14 +172,19 @@ public class JieShunParkCallbackService extends BaseParkService implements ParkB return null; } + JieShunUtil jieshun = new JieShunUtil(); private ParkNotifyParam parsePaidNoticyParamSingle(Map vo) { ParkNotifyParam p = new ParkNotifyParam(); - p.setCarNumber((String) vo.get("carNumber")); + p.setCarNumber(handleCarNumber((String) vo.get("carNumber"))); p.setParkId(String.valueOf(vo.get("parkCode"))); - p.setParkOrderId((String) vo.get("orderNo")); + p.setParkOrderId((String) vo.get("operatorId")); p.setSynId((String) vo.get("itemId")); - p.setFee(vo.get("totalFee").toString()); - p.setPayTime((Date) vo.get("tradeTime")); + p.setFee(vo.get("ssMoney").toString()); + try { + p.setPayTime(jieshun.utcToLocal((String)vo.get("feesTime"))); + } catch (ParseException e) { + e.printStackTrace(); + } return p; } }