玉桥-整个停车场-充电会员多免费半小时

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

@@ -985,20 +985,34 @@ public class ParkingRecordServiceImpl extends ServiceImpl<ParkingRecordMapper, P
 //                        if (betweenInt > 0) {
 //                            parkingTimeInt = parkingTimeInt - betweenInt;
 //                        }
-                        if("1".equals(parkingMember.getParkId())){
-                            if (parkingTimeInt <=31) {
-                                parkingTimeInt =parkingTimeInt- parkingFee.getNewEnergyFreeDuration();
-                                if(parkingTimeInt<0)
-                                {
-                                    parkingTimeInt =0;
-                                }
-                            }
-                            //如果充电完成后超过30分钟出场，则计费时间为：超出时间+停车场新能源车免费时间
-                            if (parkingTimeInt > 31) {
-                                parkingTimeInt = (parkingTimeInt - 30) + parkingFee.getNewEnergyFreeDuration();
+
+//荆州院子之前的逻辑
+//                        if("1".equals(parkingMember.getParkId())){
+//                            if (parkingTimeInt <=31) {
+//                                parkingTimeInt =parkingTimeInt- parkingFee.getNewEnergyFreeDuration();
+//                                if(parkingTimeInt<0)
+//                                {
+//                                    parkingTimeInt =0;
+//                                }
+//                            }
+//                            //如果充电完成后超过30分钟出场，则计费时间为：超出时间+停车场新能源车免费时间
+//                            if (parkingTimeInt > 31) {
+//                                parkingTimeInt = (parkingTimeInt - 30) + parkingFee.getNewEnergyFreeDuration();
+//                            }
+//                        }else{
+//                            parkingTimeInt = parkingTimeInt + parkingFee.getNewEnergyFreeDuration();
+//                        }
+//最开始的逻辑
+                        if (parkingTimeInt <=31) {
+                            parkingTimeInt =parkingTimeInt- parkingFee.getNewEnergyFreeDuration();
+                            if(parkingTimeInt<0)
+                            {
+                                parkingTimeInt =0;
                             }
-                        }else{
-                            parkingTimeInt = parkingTimeInt + parkingFee.getNewEnergyFreeDuration();
+                        }
+                        //如果充电完成后超过30分钟出场，则计费时间为：超出时间+停车场新能源车免费时间
+                        if (parkingTimeInt > 31) {
+                            parkingTimeInt = (parkingTimeInt - 30) + parkingFee.getNewEnergyFreeDuration();
                         }
                     }else{
                         parkingTimeInt =parkingTimeInt- 30;

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

@@ -653,11 +653,11 @@ class ChargingParkingApplicationTests {
     void contextLoads1111111111111111111111111111() {
 
         try {
-
-            if (DateUtil.parse("2024-03-27 06:29:09").compareTo(DateUtil.offsetSecond(DateUtil.parse("2024-03-27 06:08:22"), -30)) < 0) {
-
-                System.out.println("1111111111111111");
-            }
+//
+//            if (DateUtil.parse("2024-03-27 06:29:09").compareTo(DateUtil.offsetSecond(DateUtil.parse("2024-03-27 06:08:22"), -30)) < 0) {
+//
+//                System.out.println("1111111111111111");
+//            }
 
             //1771830983861047298 鄂DD26100 荆州院子 136分钟   实际9元 应该收费3元 没有充电---------新能源车
             //1769951488673681409 鄂DD26H6 御河 442分钟-7小时22分钟  实际收费16元 ----------------- 汽油车
@@ -667,7 +667,9 @@ class ChargingParkingApplicationTests {
             //2024-03-18 18:19:31
             //2024-03-18 22:41:38
             //4
-            ParkingRecord parkingRecord = parkingRecordService.getById("1772747449024221185");
+            //1778256096084987905
+            //1778720139514056706
+            ParkingRecord parkingRecord = parkingRecordService.getById("1778720139514056706");
             ParkingCostDTO parkingCostDTO  = parkingFeeService.parkingCost2(parkingRecord);
 
             System.out.println(parkingCostDTO);