From 079016ae4c7eeb5edc209b495d4ca5cd8b3102cf Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 16 Dec 2020 15:11:51 +0800 Subject: [PATCH 1/7] fix car --- .../car/jieshun/WxCarJieShunCallBackController.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 064a9c8e8..644331a5d 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 @@ -89,10 +89,9 @@ public class WxCarJieShunCallBackController extends WxParkCallBackBaseController * @Date 2020/7/12 上午9:00 **/ @PostMapping(value = "/parkOut") - public Result parkOutCallback(@RequestBody WxCarCYFVo param) { - String requestJson = JSONObject.toJSONString(param); - log.info("["+getIpAddr()+"jieshunCarCallback parkOut: " + requestJson); - return super.parkOutCallBack(EnumCarVendor.CAE_CYF, EnumCarCmd.CAR_JIESHUN_CALLBACK_PARK_OUT, param); + 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); } From a6f8e9642fd7b29e5257209b0e1aa8623f8b61dd Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 16 Dec 2020 15:46:32 +0800 Subject: [PATCH 2/7] fix car --- .../car/jieshun/WxCarJieShunCallBackController.java | 2 +- .../impl/jieshun/JieShunParkCallbackService.java | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) 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; } } From 9228ec19188701067567b9c015a09187ab97ede3 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 16 Dec 2020 15:53:23 +0800 Subject: [PATCH 3/7] fix car --- .../service/park/impl/jieshun/JieShunParkService.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java index 276b2e993..6cce28fb9 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java @@ -167,8 +167,15 @@ public class JieShunParkService extends BaseParkService implements ParkAdapterSe String _createTime = attribute.getString("startTime");//计费时间,格式为“yyyy-MM-dd HH:mi:ss” String _endTime = attribute.getString("endTime");//离场时间,格式为“yyyy-MM-dd HH:mi:ss” String msg = attribute.getString("retmsg"); - return new ResultData(new ParkStopFee("-999",jieshun.utcToLocal(_createTime),jieshun.utcToLocal(_endTime), - "0.00",appId,"payPath",null,msg)); + if (!StringUtils.isBlank(msg)) { + if (msg.contains("未入场")) { + return new ResultData(new ParkStopFee(null,jieshun.utcToLocal(_createTime),jieshun.utcToLocal(_endTime), + "0.00",appId,"payPath",null,msg)); + }else { + return new ResultData(new ParkStopFee("-999",jieshun.utcToLocal(_createTime),jieshun.utcToLocal(_endTime), + "0.00",appId,"payPath",null,msg)); + } + } } String parkOrderId = attribute.getString("orderNo"); From 43cf3f73a02446d521a3b32e14dad69f20c8e940 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 16 Dec 2020 15:59:47 +0800 Subject: [PATCH 4/7] fix car --- .../service/park/impl/jieshun/JieShunParkCallbackService.java | 3 --- 1 file changed, 3 deletions(-) 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 d07f66706..28937a968 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 @@ -142,9 +142,6 @@ public class JieShunParkCallbackService extends BaseParkService implements ParkB return null; } p.setFee(String.valueOf(paramMap.get("ssMoney"))); - WxCarJSOrder order = new WxCarJSOrder(); - order.setCarNumber(realCarNumber); - wxCarJSOrderMapper.updateStatus(order); return p; } From 86e14fa36c42d7b894fca740745f4f44e6d04e25 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 16 Dec 2020 16:08:56 +0800 Subject: [PATCH 5/7] fix car --- .../service/park/impl/jieshun/JieShunParkCallbackService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 28937a968..4d8634ac4 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 @@ -174,7 +174,7 @@ public class JieShunParkCallbackService extends BaseParkService implements ParkB ParkNotifyParam p = new ParkNotifyParam(); p.setCarNumber(handleCarNumber((String) vo.get("carNumber"))); p.setParkId(String.valueOf(vo.get("parkCode"))); - p.setParkOrderId((String) vo.get("operatorId")); + p.setParkOrderId((String) vo.get("itemId")); p.setSynId((String) vo.get("itemId")); p.setFee(vo.get("ssMoney").toString()); try { From d2a9416ac466dc0c5b0577bf6ca46afb158c5791 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 16 Dec 2020 17:07:52 +0800 Subject: [PATCH 6/7] fix car --- .../service/park/impl/jieshun/JieShunParkService.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java index 6cce28fb9..8c938d196 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java @@ -146,6 +146,13 @@ public class JieShunParkService extends BaseParkService implements ParkAdapterSe if (StringUtils.isBlank(carNumber)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "carNumber为空"); } + + //如果车牌号是鄂AAAAAA, 为测试车牌 + if (carNumber.equals("鄂AAAAAA")) { + return new ResultData(new ParkStopFee("-111",jieshun.utcToLocal("2020-12-16 00:00:00"),jieshun.utcToLocal("2020-12-17 00:00:00"), + "0.00","wx24b70f0ad2a9a89a","payPath",null,"测试车牌,仅测试用")); + } + //下订单; String retCode = jieshun.createOrder(park, carNumber, getCacheToken(park)); if (StringUtils.isBlank(retCode)) { From 887151871f1a73961d6626bc1d0120a4acbe3087 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 16 Dec 2020 17:13:20 +0800 Subject: [PATCH 7/7] fix car --- .../iformall/service/park/impl/jieshun/JieShunParkService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java index 8c938d196..8145c8209 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java @@ -150,7 +150,7 @@ public class JieShunParkService extends BaseParkService implements ParkAdapterSe //如果车牌号是鄂AAAAAA, 为测试车牌 if (carNumber.equals("鄂AAAAAA")) { return new ResultData(new ParkStopFee("-111",jieshun.utcToLocal("2020-12-16 00:00:00"),jieshun.utcToLocal("2020-12-17 00:00:00"), - "0.00","wx24b70f0ad2a9a89a","payPath",null,"测试车牌,仅测试用")); + "0.01","wx24b70f0ad2a9a89a","payPath",null,"测试车牌,仅测试用")); } //下订单;