Browse Source

最小充电免费时间默认为(2小时),不根据停车场设置来

fulonglong 2 years ago
parent
commit
16bff6514a

+ 3 - 1
src/main/java/com/charging/chargingparking/service/impl/ParkingMemberServiceImpl.java

@@ -74,7 +74,9 @@ public class ParkingMemberServiceImpl extends ServiceImpl<ParkingMemberMapper, P
         //非后台添加会员(用户充电完成后自动添加会员)
         if (!backFlag) {
             //最小充电免费时间
-            Integer minChargingFree = parkingInfo.getChargingFreeDuration();
+         //   Integer minChargingFree = parkingInfo.getChargingFreeDuration();
+            //最小充电免费时间默认为(2小时),不根据停车场设置来
+            Integer minChargingFree = 120;
             QueryWrapper<ParkingMember> parkingMemberQueryWrapper = new QueryWrapper<>();
 
             parkingMemberQueryWrapper.eq("park_id", addParkingMember.getParkingUname());

+ 1 - 1
src/main/java/com/charging/chargingparking/service/impl/ParkingRecordServiceImpl.java

@@ -109,7 +109,7 @@ public class ParkingRecordServiceImpl extends ServiceImpl<ParkingRecordMapper, P
         String dataStr = StringUtils.getAlarmInfoPlateTimeStr(alarmInfoPlate.getResult().getPlateResult().getTimeStamp().getTimeval());
         //比较时间与当前时间,如果相差30S则不处理
         if (DateUtil.parse(dataStr).compareTo(DateUtil.offsetSecond(new Date(), -30)) < 0) {
-            throw new Exception(StrUtil.format("记录时间与创建时间相差超过30s,记录:{}", alarmInfoPlate));
+            throw new Exception(StrUtil.format("记录时间与创建时间相差超过30s,记录:{}",alarmInfoPlate.getResult().getPlateResult().getLicense()));
         }