From b3738a42e345db2817dbff4168414be89997ba45 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 15 Dec 2021 15:39:13 +0800 Subject: [PATCH] fix bug --- .../WxCarHaiKangWeiShiCallBackController.java | 56 ++++++++++--------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/haikangweishi/WxCarHaiKangWeiShiCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/haikangweishi/WxCarHaiKangWeiShiCallBackController.java index 93652bd62..d61e1f311 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/haikangweishi/WxCarHaiKangWeiShiCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/haikangweishi/WxCarHaiKangWeiShiCallBackController.java @@ -191,31 +191,37 @@ public class WxCarHaiKangWeiShiCallBackController extends WxParkCallBackBaseCont */ @PostMapping(value = "/notify") public Map notify(@RequestBody Map paramMap) { - log.info("["+getIpAddr()+"] hkwsCarCallback notify: " + paramMap.toString()); - - Map params = (Map)paramMap.get("params"); - String eventType = params.get("eventType").toString(); - Result result = null; - if ("771760131".equals(eventType)) { - //解析车易付参数 - result = super.parkInCallBack(EnumCarVendor.CAR_HAIKANGWEISHI, EnumCarCmd.CAR_HAIKANGWEISHI_CALLBACK_PARK_IN, paramMap); - }else if ("771760134".equals(eventType)) { - result = super.parkOutCallBack(EnumCarVendor.CAR_HAIKANGWEISHI, EnumCarCmd.CAR_HAIKANGWEISHI_CALLBACK_PARK_OUT, paramMap); - } - Map retMap = new HashMap(); - int errcode = 0; - String msg = "success"; - if (null != result) { - if (result.code != Result.SUCCESS) { - errcode = result.code; - msg = result.message; - } - }else { - errcode = Result.ERROR; - msg = "no result.eventType["+eventType+"]"; - } - retMap.put("errcode", errcode); - retMap.put("errmsg", msg); + Map retMap = new HashMap(); + try { + log.info("["+getIpAddr()+"] hkwsCarCallback notify: " + paramMap.toString()); + + Map params = (Map)paramMap.get("params"); + String eventType = params.get("eventType").toString(); + Result result = null; + if ("771760131".equals(eventType)) { + //解析车易付参数 + result = super.parkInCallBack(EnumCarVendor.CAR_HAIKANGWEISHI, EnumCarCmd.CAR_HAIKANGWEISHI_CALLBACK_PARK_IN, paramMap); + }else if ("771760134".equals(eventType)) { + result = super.parkOutCallBack(EnumCarVendor.CAR_HAIKANGWEISHI, EnumCarCmd.CAR_HAIKANGWEISHI_CALLBACK_PARK_OUT, paramMap); + } + + int errcode = 0; + String msg = "success"; + if (null != result) { + if (result.code != Result.SUCCESS) { + errcode = result.code; + msg = result.message; + } + }else { + errcode = Result.ERROR; + msg = "no result.eventType["+eventType+"]"; + } + retMap.put("errcode", errcode); + retMap.put("errmsg", msg); + } catch(Exception e) { + retMap.put("errcode", Result.ERROR); + retMap.put("errmsg", "notify error."+e.getLocalizedMessage()); + } retMap.put("data", null); return retMap; }