玉桥公园停车场晚上11：00到第二天7：00，所有车辆免停车费。（新能源车不分快慢充和燃油车也免费）

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

@@ -227,7 +227,35 @@ public class ParkingMemberServiceImpl extends ServiceImpl<ParkingMemberMapper, P
                     }
 
                 }
+                //夜间（23:00:00~07:00:00）玉桥停车场（不分快慢充），如果是在此时间段充电的用户默认赠送会员至07:00:00
+                if (parkingInfo.getNightFree()&&"b8af9b63-e7df-479a-9ea6-cf472bc3d1eb".equals(parkingInfo.getId())) {
+                    if (parkingMember1.getMemberEndTime().compareTo(DateUtil.parse(temStartDate2)) >= 0 && parkingMember1.getMemberEndTime().compareTo(DateUtil.parse(temEndDate2)) <= 0) {
+                        parkingMember1.setMemberEndTime(DateUtil.offsetDay(DateUtil.parse(temEndDate3), 1));
+                    }
+                    if (parkingMember1.getMemberEndTime().compareTo(DateUtil.parse(temStartDate3)) >= 0 && parkingMember1.getMemberEndTime().compareTo(DateUtil.parse(temEndDate3)) <= 0) {
+                        //add by hbjzws 2023-08-03区间扩大的BUG(解决夜间3点左右会员开始时间调整为前天23:00)
+                        Date d1 =DateUtil.offsetDay(DateUtil.parse(temEndDate3), -1);
+                        String d2 =DateUtil.format(d1, "yyyy-MM-dd");
+                        String d3 =d2 + " 23:00:00";
+                        if(parkingMember1.getMemberStartTime().compareTo(DateUtil.parse(d3))>0){
+                            parkingMember1.setMemberStartTime(DateUtil.parse(d3));
+                        }
+                        parkingMember1.setMemberEndTime(DateUtil.parse(temEndDate3));
+                    }
+                    if (parkingMember1.getMemberEndTime().compareTo(DateUtil.parse(temStartDate3)) >= 0 && parkingMember1.getMemberEndTime().compareTo(DateUtil.parse(temEndDate3)) > 0) {
+                        //add by hbjzws 2023-08-10 区间扩大未完整解决
+                        // （鄂DDT9443  2023-08-10 03:09:03---2023-08-10 07:04:03）07:04:03这个时间超过区间
+                        Date d1 =DateUtil.offsetDay(DateUtil.parse(temEndDate3), -1);
+                        String d2 =DateUtil.format(d1, "yyyy-MM-dd");
+                        String d3 =d2 + " 23:00:00";
+                        if(parkingMember1.getMemberStartTime().compareTo(DateUtil.parse(d3))>0){
+                            parkingMember1.setMemberStartTime(DateUtil.parse(d3));
+                        }
+                        //parkingMember1.setMemberEndTime(DateUtil.parse(temEndDate3));
+                    }
+
 
+                }
                 save(parkingMember1);
                 parkingMember = parkingMember1;
                 //会员日志

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

@@ -853,6 +853,10 @@ public class ParkingRecordServiceImpl extends ServiceImpl<ParkingRecordMapper, P
         if (carNum.length() == 8 && parkingInfo.getNightFree()) {
             freeTime = parkingFeeService.getFreeTime(parkingRecord);
         }
+        //add by hbjzws 2024-01-04 玉桥停车场要所有车辆在23:00-7:00都免费
+        if(carNum.length() == 7&&"b8af9b63-e7df-479a-9ea6-cf472bc3d1eb".equals(parkingRecord.getParkId())){
+            freeTime = parkingFeeService.getFreeTime(parkingRecord);
+        }
         //add by hbjzws 2023-07-01 慢充不免费
         if("1".equals(parkingRecord.getParkId())){
             //查询是否有会员

src/test/java/com/charging/chargingparking/ChargingParkingApplicationTests.java

@@ -96,10 +96,9 @@ class ChargingParkingApplicationTests {
 
     @Test
     void test342() throws Exception {
-        ParkingMember parkingMember = new ParkingMember();
-        //parkingMember.setParkId("1");
-        parkingMember.setArea("0");
-        parkingMemberService.save(parkingMember);
+        String carNum ="鄂NBP111";
+        System.out.println(carNum.length());
+
     }
 
     @Test
@@ -462,7 +461,7 @@ class ChargingParkingApplicationTests {
     void contextLoads1111111111111111111111111111() {
 
         try {
-            ParkingRecord parkingRecord = parkingRecordService.getById("1720887329575505921");
+            ParkingRecord parkingRecord = parkingRecordService.getById("1736401048422158337");
             ParkingCostDTO parkingCostDTO  = parkingFeeService.parkingCost2(parkingRecord);
 
             System.out.println(parkingCostDTO);