From 1e2351ba2086b85403045fbbe4a18e06ad9b852b Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Tue, 1 Aug 2023 17:52:27 +0800 Subject: [PATCH] fix dahua car --- .../service/park/impl/dahua/DaHuaParkService.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkService.java index 963a830b2..4a28dc793 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkService.java @@ -136,11 +136,17 @@ public class DaHuaParkService extends BaseParkService implements ParkAdapterServ if (StringUtils.isBlank(retCode)) { throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(), "dahua getCarStopFee error. has no result"); } - + String appId = "wxe01cc0f34a5c70dc"; JSONObject result = JSON.parseObject(retCode); if (!result.getBoolean("success") ) { String message = result.getString("errMsg"); - throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(), "dahua getCarStopFee error."+message); + if (StringUtils.isNotBlank(message)&& message.contains("操作过于频繁")) { + return new ParkStopFee("-111",dahua.utcToLocal("1990-01-01 00:00:00"),dahua.utcToLocal("1990-01-01 00:00:00"), + "999999999",appId,"payPath",null,null,"大华提示:"+message); + }else { + //do nothing + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(), "dahua getCarStopFee error."+message); + } } JSONObject attribute = result.getJSONObject("data"); if (null == attribute ) { @@ -148,10 +154,9 @@ public class DaHuaParkService extends BaseParkService implements ParkAdapterServ } BigDecimal totalFee = attribute.getBigDecimal("notPaidAmount"); - String appId = "wxe01cc0f34a5c70dc"; + String parkOrderId = attribute.getString("parkingRecordId"); Integer freeMinute = (Integer)park.getVendorParamsByKey("freeMinute"); - Date createTime = DateUtils.string2Date(attribute.getString("carInTime"),DateUtils.DATE_TIME_PATTERN).getTime();//计费时间,格式为“yyyy-MM-dd HH:mi:ss” Long seconds = attribute.getLong("duration");//停车时长秒 Date endTime = DateUtils.getSecondsTimeAfter(seconds, createTime);//离场时间,格式为“yyyy-MM-dd HH:mi:ss”