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 d537f5b10..77103c508 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 @@ -1,5 +1,6 @@ package com.iformall.service.park.impl.dahua; +import java.math.BigDecimal; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -37,6 +38,7 @@ import com.iformall.service.park.entity.ParkStopFee; import com.iformall.service.park.impl.BaseParkService; import com.iformall.service.park.impl.util.ParkHelper; import com.iformall.service.park.utils.ParkCacheUtils; +import com.iformall.utils.DateUtils; import com.iformall.utils.RedisCacheUtils; import com.iformall.utils.RedisLock; @@ -160,16 +162,16 @@ public class DaHuaParkService extends BaseParkService implements ParkAdapterServ throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(), "dahua getCarStopFee error. no order result"+carNumber); } - Double totalFee = attribute.getDouble("totalFee"); + BigDecimal totalFee = attribute.getBigDecimal("notPaidAmount"); String appId = "wxe01cc0f34a5c70dc"; - String parkOrderId = null; - //String parkOrderId = attribute.getString("orderNo"); + String parkOrderId = attribute.getString("parkingRecordId"); Integer freeMinute = (Integer)park.getVendorParamsByKey("freeMinute"); - String createTime = attribute.getString("startTime");//计费时间,格式为“yyyy-MM-dd HH:mi:ss” - //String endTime = attribute.getString("endTime");//离场时间,格式为“yyyy-MM-dd HH:mi:ss” + Date createTime = DateUtils.string2Date(attribute.getString("carInTime"),DateUtils.DATE_TIME_PATTERN).getTime();//计费时间,格式为“yyyy-MM-dd HH:mi:ss” + Long seconds = attribute.getLong("duration")*60;//停车时长秒 + Date endTime = DateUtils.getSecondsTimeAfter(seconds, createTime);//离场时间,格式为“yyyy-MM-dd HH:mi:ss” String payPath = "pages/parkingOrder/parkingOrder?carNum="+carNumber+"&isFromPay=1&filterRoadsideInParking=0"; - return new ParkStopFee(parkOrderId,dahua.utcToLocal(createTime),new Date(), + return new ParkStopFee(parkOrderId,createTime,endTime, String.valueOf(totalFee),appId,payPath,null,null,"请支付后"+freeMinute+"分钟内离场"); } diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaUtil.java index bed791a4d..1ed98db8f 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaUtil.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaUtil.java @@ -51,7 +51,8 @@ import java.util.TimeZone; public class DaHuaUtil { public static final String TOKEN_URL = "https://www.cloud-dahua.com/gateway/auth/oauth/token"; - public static final String QUERY_FEE = "https://open-pkc.cloud-dahua.com/openplatform/parkinglot/v1/getNotPaidAmountByCarNum"; + //public static final String QUERY_FEE = "https://open-pkc.cloud-dahua.com/openplatform/parkinglot/v1/getNotPaidAmountByCarNum"; + public static final String QUERY_FEE = "https://open-pkc.cloud-dahua.com/openplatform/parkinglot/v1/getParkingFees"; public static final String GET_COUPON = "https://open-pkc.cloud-dahua.com/openplatform/coupon/v1/grantCoupon"; public static final String COUPON_USE = "https://open-pkc.cloud-dahua.com/openplatform/coupon/v1/issueCoupon"; diff --git a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java index a76cbe59d..0a92e0532 100755 --- a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java +++ b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java @@ -417,6 +417,12 @@ public class DateUtils { Date testDate = new Date(myTime * 1000); return testDate; } + + public static Date getSecondsTimeAfter(long seconds, Date myDate) { + long myTime = (myDate.getTime() / 1000) + seconds; + Date testDate = new Date(myTime * 1000); + return testDate; + } /** * 获得当前时间后几分钟的时间