| @@ -145,7 +145,7 @@ public class DaHuaParkService extends BaseParkService implements ParkAdapterServ | |||||
| private ParkStopFee jieshunCarStopFee(Map<String, String> paramMap, WxPark park,String carNumber) throws Exception{ | private ParkStopFee jieshunCarStopFee(Map<String, String> paramMap, WxPark park,String carNumber) throws Exception{ | ||||
| //下订单; | //下订单; | ||||
| String retCode = dahua.createOrder(park, carNumber, getCacheToken(park)); | |||||
| String retCode = dahua.getCarStopFee(park, carNumber, getCacheToken(park)); | |||||
| if (StringUtils.isBlank(retCode)) { | if (StringUtils.isBlank(retCode)) { | ||||
| throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(), "dahua createOrder error. has no result"); | throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(), "dahua createOrder error. has no result"); | ||||
| } | } | ||||
| @@ -153,66 +153,24 @@ public class DaHuaParkService extends BaseParkService implements ParkAdapterServ | |||||
| JSONObject result = JSON.parseObject(retCode); | JSONObject result = JSON.parseObject(retCode); | ||||
| if (!result.getBoolean("success") ) { | if (!result.getBoolean("success") ) { | ||||
| String message = result.getString("errMsg"); | String message = result.getString("errMsg"); | ||||
| throw new MallinkException(result.getInteger("code"), "dahua createOrder error."+message); | |||||
| throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(), "dahua createOrder error."+message); | |||||
| } | } | ||||
| JSONObject arrays = result.getJSONObject("data"); | |||||
| if (null == arrays || arrays.size() == 0) { | |||||
| throw new MallinkException(result.getInteger("resultCode"), "jieshun createOrder error. no order result"+carNumber); | |||||
| JSONObject attribute = result.getJSONObject("data"); | |||||
| if (null == attribute ) { | |||||
| throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(), "dahua createOrder error. no order result"+carNumber); | |||||
| } | } | ||||
| Double totalFee = attribute.getDouble("totalFee"); | |||||
| String appId = "wxe01cc0f34a5c70dc"; | |||||
| String parkOrderId = attribute.getString("orderNo"); | |||||
| Integer freeMinute = (Integer)park.getVendorParamsByKey("freeMinute"); | |||||
| // JSONObject attribute = arrays.getJSONObject(0).getJSONObject("attributes"); | |||||
| // Double totalFee = attribute.getDouble("totalFee"); | |||||
| // String appId = "wx24b70f0ad2a9a89a"; | |||||
| // String parkOrderId = attribute.getString("orderNo"); | |||||
| // Integer freeMinute = (Integer)park.getVendorParamsByKey("freeMinute"); | |||||
| // if (totalFee <= 0 ) { | |||||
| // 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"); | |||||
| // if (!StringUtils.isBlank(msg)) { | |||||
| // if (msg.contains("未入场")) { | |||||
| // return new ParkStopFee(null,jieshun.utcToLocal(_createTime),jieshun.utcToLocal(_endTime), | |||||
| // "0.00",appId,"payPath",null,msg,null); | |||||
| // }else { | |||||
| // //0元订单结清,查询是否用过打折方案,如果用过,则需要调用接口结清订单 | |||||
| // Integer used = ParkCacheUtils.getCarCouponUseCacheLock(redisTemplate, EnumCarVendor.CAR_JIESHUN_V2.getMessage(), carNumber); | |||||
| // if (null == used || (null != used && used.intValue() < 1)) { | |||||
| // //未使用停车券 | |||||
| // return new ParkStopFee("-999",jieshun.utcToLocal(_createTime),jieshun.utcToLocal(_endTime), | |||||
| // "0.00",appId,"payPath",null,msg,null); | |||||
| // }else { | |||||
| // return new ParkStopFee("-999",jieshun.utcToLocal(_createTime),jieshun.utcToLocal(_endTime), | |||||
| // "0.00",appId,"payPath",null,msg,"用券抵扣后账单为0,获得"+freeMinute+"分钟免费出场时间"); | |||||
| // } | |||||
| // } | |||||
| // } | |||||
| // } | |||||
| // | |||||
| // | |||||
| // String ret = jieshun.getCarStopFee(park, parkOrderId, getCacheToken(park)); | |||||
| // JSONObject retObj = JSON.parseObject(ret); | |||||
| // if (retObj.getIntValue("resultCode") == 0){ | |||||
| // JSONArray retArrays = retObj.getJSONArray("dataItems"); | |||||
| // if (null == retArrays || retArrays.size() == 0 ) { | |||||
| // throw new MallinkException(result.getInteger("resultCode"), "jieshun getCarStopFee error. no order result"+carNumber); | |||||
| // } | |||||
| // | |||||
| // JSONObject retObject = retArrays.getJSONObject(0).getJSONObject("attributes"); | |||||
| // String createTime = retObject.getString("startTime");//计费时间,格式为“yyyy-MM-dd HH:mi:ss” | |||||
| // String endTime = retObject.getString("endTime");//离场时间,格式为“yyyy-MM-dd HH:mi:ss” | |||||
| // String payPath = "pages/thirdPayOrderByNo/payOrder?orderNo="+parkOrderId+"&freeMinute="+freeMinute; | |||||
| // //String payPath = "pages/thirdPayOrder/payOrder?carNo="+jieshun.handleCarNumber(carNumber)+"&parkCode="+park.getParkingId(); | |||||
| // return new ParkStopFee(parkOrderId,jieshun.utcToLocal(createTime),jieshun.utcToLocal(endTime), | |||||
| // String.valueOf(retObject.getDouble("totalFee")),appId,payPath,null,null,"请支付后"+freeMinute+"分钟内离场"); | |||||
| // }else { | |||||
| // logger.error("jieshunCarStopFee error. paramMap: {} . jieshunResult: {}",JSON.toJSONString(paramMap),ret); | |||||
| // String msg = retObj.getString("message"); | |||||
| // throw new MallinkException(ErrorCode.CYF_STOP_FEE_FAIL.getCode(), "停车费获取失败:"+msg); | |||||
| // } | |||||
| return null; | |||||
| String createTime = attribute.getString("startTime");//计费时间,格式为“yyyy-MM-dd HH:mi:ss” | |||||
| String endTime = attribute.getString("endTime");//离场时间,格式为“yyyy-MM-dd HH:mi:ss” | |||||
| String payPath = "pages/parkingPay/parkingPay?orderNo="+parkOrderId+"&freeMinute="+freeMinute; | |||||
| //String payPath = "pages/thirdPayOrder/payOrder?carNo="+jieshun.handleCarNumber(carNumber)+"&parkCode="+park.getParkingId(); | |||||
| return new ParkStopFee(parkOrderId,dahua.utcToLocal(createTime),dahua.utcToLocal(endTime), | |||||
| String.valueOf(totalFee),appId,payPath,null,null,"请支付后"+freeMinute+"分钟内离场"); | |||||
| } | } | ||||
| /** | /** | ||||