锦天停车场不管充电时间，统一设置成2小时会员免费

src/main/java/com/charging/chargingparking/service/impl/ParkingMemberServiceImpl.java

@@ -74,7 +74,7 @@ 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<>();
@@ -98,15 +98,16 @@ public class ParkingMemberServiceImpl extends ServiceImpl<ParkingMemberMapper, P
             }
 
 
-
-
-
             //会员不存在，则新增会员
             if (parkingMember == null) {
-
                 //判断时间和最小充电时间
                 if (min <= minChargingFree) {
                     min = minChargingFree;
+                } else {
+                    //锦天停车场不管充电时间，统一为2小时免费
+                    if ("5f8d343e-63d1-4ef0-9844-855ca020d92b".equals(parkingInfo.getId())) {
+                        min = minChargingFree;
+                    }
                 }
 
                 ParkingMember parkingMember1 = new ParkingMember();
@@ -131,7 +132,7 @@ public class ParkingMemberServiceImpl extends ServiceImpl<ParkingMemberMapper, P
 
 
                 //夜间（23:00:00~07:00:00）免费停车的停车场，如果是在此时间段充电的用户默认赠送会员至07:00:00
-                if (parkingInfo.getNightFree()){
+                if (parkingInfo.getNightFree()) {
                     if (parkingMember1.getMemberEndTime().compareTo(DateUtil.parse(temStartDate2)) >= 0 && parkingMember1.getMemberEndTime().compareTo(DateUtil.parse(temEndDate2)) <= 0) {
                         parkingMember1.setMemberEndTime(DateUtil.offsetDay(DateUtil.parse(temEndDate3), 1));
                     }
@@ -150,45 +151,49 @@ public class ParkingMemberServiceImpl extends ServiceImpl<ParkingMemberMapper, P
                 parkingMemberLog.setContent(StrUtil.format("{}会员新增，会员时长{}分钟", addParkingMember.getCarNum(), min));
                 parkingMemberLogService.save(parkingMemberLog);
             } else {
-                //如果会员存在并且未出场则时间累加
-                QueryWrapper<ParkingRecord> parkingRecordQueryWrapper = new QueryWrapper<>();
-                parkingRecordQueryWrapper.eq("car_num", addParkingMember.getCarNum());
-                parkingRecordQueryWrapper.eq("park_id", addParkingMember.getParkingUname());
-                //     parkingRecordQueryWrapper.eq("release_status","0");
-                parkingRecordQueryWrapper.orderByDesc("create_time");
-                parkingRecordQueryWrapper.last("LIMIT 1");
-                ParkingRecord parkingRecord = parkingRecordService.getOne(parkingRecordQueryWrapper);
-
-                if (parkingRecord == null || "1".equals(parkingRecord.getReleaseStatus())) {
-                    Date endTime = DateUtil.offsetMinute(new Date(), min);
-                    if (parkingMember.getMemberEndTime().compareTo(endTime) < 0) {
-                        //     parkingMember.setMemberStartTime(addParkingMember.getMemberStartTime());
-
-                        parkingMember.setMemberEndTime(DateUtil.offsetMinute(parkingMember.getMemberEndTime(), Convert.toInt(DateUtil.between(parkingMember.getMemberEndTime(), endTime, DateUnit.MINUTE))));
-                        //    parkingMember.setMemberType(addParkingMember.getMemberType());
-                        parkingMember.setUpdateTime(new Date());
-                        updateById(parkingMember);
-                        //会员日志
-                        ParkingMemberLog parkingMemberLog = new ParkingMemberLog();
-                        parkingMemberLog.setParkingMemberId(parkingMember.getId());
-                        parkingMemberLog.setCreateTime(new Date());
-                        parkingMemberLog.setContent(StrUtil.format("{}会员更新会员时间，会员时长{}分钟", parkingMember.getMemberCarNum(), min));
-                        parkingMemberLogService.save(parkingMemberLog);
-                    }
 
+                //锦天停车场已存在会员不累加会员时间
+                if (!"5f8d343e-63d1-4ef0-9844-855ca020d92b".equals(parkingInfo.getId())) {
+                    //如果会员存在并且未出场则时间累加
+                    QueryWrapper<ParkingRecord> parkingRecordQueryWrapper = new QueryWrapper<>();
+                    parkingRecordQueryWrapper.eq("car_num", addParkingMember.getCarNum());
+                    parkingRecordQueryWrapper.eq("park_id", addParkingMember.getParkingUname());
+                    //     parkingRecordQueryWrapper.eq("release_status","0");
+                    parkingRecordQueryWrapper.orderByDesc("create_time");
+                    parkingRecordQueryWrapper.last("LIMIT 1");
+                    ParkingRecord parkingRecord = parkingRecordService.getOne(parkingRecordQueryWrapper);
+
+                    if (parkingRecord == null || "1".equals(parkingRecord.getReleaseStatus())) {
+                        Date endTime = DateUtil.offsetMinute(new Date(), min);
+                        if (parkingMember.getMemberEndTime().compareTo(endTime) < 0) {
+                            //     parkingMember.setMemberStartTime(addParkingMember.getMemberStartTime());
+
+                            parkingMember.setMemberEndTime(DateUtil.offsetMinute(parkingMember.getMemberEndTime(), Convert.toInt(DateUtil.between(parkingMember.getMemberEndTime(), endTime, DateUnit.MINUTE))));
+                            //    parkingMember.setMemberType(addParkingMember.getMemberType());
+                            parkingMember.setUpdateTime(new Date());
+                            updateById(parkingMember);
+                            //会员日志
+                            ParkingMemberLog parkingMemberLog = new ParkingMemberLog();
+                            parkingMemberLog.setParkingMemberId(parkingMember.getId());
+                            parkingMemberLog.setCreateTime(new Date());
+                            parkingMemberLog.setContent(StrUtil.format("{}会员更新会员时间，会员时长{}分钟", parkingMember.getMemberCarNum(), min));
+                            parkingMemberLogService.save(parkingMemberLog);
+                        }
 
-                } else {
-                    if ("0".equals(parkingRecord.getReleaseStatus())) {
-                        parkingMember.setMemberEndTime(DateUtil.offset(parkingMember.getMemberEndTime(), DateField.MINUTE, min));
-                        //  parkingMember.setMemberType(addParkingMember.getMemberType());
-                        parkingMember.setUpdateTime(new Date());
-                        updateById(parkingMember);
-                        //会员日志
-                        ParkingMemberLog parkingMemberLog = new ParkingMemberLog();
-                        parkingMemberLog.setParkingMemberId(parkingMember.getId());
-                        parkingMemberLog.setCreateTime(new Date());
-                        parkingMemberLog.setContent(StrUtil.format("{}延长会员时间，延长时长{}分钟", parkingMember.getMemberCarNum(), min));
-                        parkingMemberLogService.save(parkingMemberLog);
+
+                    } else {
+                        if ("0".equals(parkingRecord.getReleaseStatus())) {
+                            parkingMember.setMemberEndTime(DateUtil.offset(parkingMember.getMemberEndTime(), DateField.MINUTE, min));
+                            //  parkingMember.setMemberType(addParkingMember.getMemberType());
+                            parkingMember.setUpdateTime(new Date());
+                            updateById(parkingMember);
+                            //会员日志
+                            ParkingMemberLog parkingMemberLog = new ParkingMemberLog();
+                            parkingMemberLog.setParkingMemberId(parkingMember.getId());
+                            parkingMemberLog.setCreateTime(new Date());
+                            parkingMemberLog.setContent(StrUtil.format("{}延长会员时间，延长时长{}分钟", parkingMember.getMemberCarNum(), min));
+                            parkingMemberLogService.save(parkingMemberLog);
+                        }
                     }
                 }
             }
@@ -329,7 +334,7 @@ public class ParkingMemberServiceImpl extends ServiceImpl<ParkingMemberMapper, P
 
                 }
                 //查看道闸是否允许白名单进出
-                if (!parkingChannel.getWhiteEnable()){
+                if (!parkingChannel.getWhiteEnable()) {
                     parkingEnableVo.setOpen(false);
                     parkingEnableVo.setContent("车辆无权限");
                     return parkingEnableVo;
@@ -483,7 +488,7 @@ public class ParkingMemberServiceImpl extends ServiceImpl<ParkingMemberMapper, P
         parkingMember.setUpdateBy(parkingShop.getSysUserId());
         updateById(parkingMember);
 
-        if (Convert.toInt(days) >0){
+        if (Convert.toInt(days) > 0) {
             //保存会员续费日志
             ParkingMemberLog parkingMemberLog = new ParkingMemberLog();
             parkingMemberLog.setParkingMemberId(parkingMember.getId());