| @@ -89,10 +89,9 @@ public class WxCarJieShunCallBackController extends WxParkCallBackBaseController | |||||
| * @Date 2020/7/12 上午9:00 | * @Date 2020/7/12 上午9:00 | ||||
| **/ | **/ | ||||
| @PostMapping(value = "/parkOut") | @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<String, Object> paramMap) { | |||||
| log.info("["+getIpAddr()+"] jieshunCarCallback parkOut: " + paramMap.toString()); | |||||
| return super.parkOutCallBack(EnumCarVendor.CAR_JIESHUN, EnumCarCmd.CAR_JIESHUN_CALLBACK_PARK_OUT, paramMap); | |||||
| } | } | ||||
| @@ -142,9 +142,6 @@ public class JieShunParkCallbackService extends BaseParkService implements ParkB | |||||
| return null; | return null; | ||||
| } | } | ||||
| p.setFee(String.valueOf(paramMap.get("ssMoney"))); | p.setFee(String.valueOf(paramMap.get("ssMoney"))); | ||||
| WxCarJSOrder order = new WxCarJSOrder(); | |||||
| order.setCarNumber(realCarNumber); | |||||
| wxCarJSOrderMapper.updateStatus(order); | |||||
| return p; | return p; | ||||
| } | } | ||||
| @@ -172,14 +169,19 @@ public class JieShunParkCallbackService extends BaseParkService implements ParkB | |||||
| return null; | return null; | ||||
| } | } | ||||
| JieShunUtil jieshun = new JieShunUtil(); | |||||
| private ParkNotifyParam parsePaidNoticyParamSingle(Map<String,Object> vo) { | private ParkNotifyParam parsePaidNoticyParamSingle(Map<String,Object> vo) { | ||||
| ParkNotifyParam p = new ParkNotifyParam(); | 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.setParkId(String.valueOf(vo.get("parkCode"))); | ||||
| p.setParkOrderId((String) vo.get("orderNo")); | |||||
| p.setParkOrderId((String) vo.get("itemId")); | |||||
| p.setSynId((String) vo.get("itemId")); | 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; | return p; | ||||
| } | } | ||||
| } | } | ||||
| @@ -146,6 +146,13 @@ public class JieShunParkService extends BaseParkService implements ParkAdapterSe | |||||
| if (StringUtils.isBlank(carNumber)) { | if (StringUtils.isBlank(carNumber)) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "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.01","wx24b70f0ad2a9a89a","payPath",null,"测试车牌,仅测试用")); | |||||
| } | |||||
| //下订单; | //下订单; | ||||
| String retCode = jieshun.createOrder(park, carNumber, getCacheToken(park)); | String retCode = jieshun.createOrder(park, carNumber, getCacheToken(park)); | ||||
| if (StringUtils.isBlank(retCode)) { | if (StringUtils.isBlank(retCode)) { | ||||
| @@ -167,8 +174,15 @@ public class JieShunParkService extends BaseParkService implements ParkAdapterSe | |||||
| String _createTime = attribute.getString("startTime");//计费时间,格式为“yyyy-MM-dd HH:mi:ss” | String _createTime = attribute.getString("startTime");//计费时间,格式为“yyyy-MM-dd HH:mi:ss” | ||||
| String _endTime = attribute.getString("endTime");//离场时间,格式为“yyyy-MM-dd HH:mi:ss” | String _endTime = attribute.getString("endTime");//离场时间,格式为“yyyy-MM-dd HH:mi:ss” | ||||
| String msg = attribute.getString("retmsg"); | 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"); | String parkOrderId = attribute.getString("orderNo"); | ||||