Просмотр исходного кода

锦天停车场和荆鹏停车场1分钟不能出场----2分钟不能出场

hbjzws 1 год назад
Родитель
Сommit
c3fab37b3d

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

@@ -620,16 +620,16 @@ public class ParkingRecordServiceImpl extends ServiceImpl<ParkingRecordMapper, P
                         if(parkingRecord1!=null&&parkingRecord1.getInParkingTime()!=null&&parkingRecord1.getOutParkingTime()!=null){
                             Date inParkingTime =parkingRecord1.getInParkingTime();
                             Date outParkingTime =parkingRecord1.getOutParkingTime();
-                            Date date = DateUtil.offsetMinute(outParkingTime, -1);
+                            Date date = DateUtil.offsetMinute(outParkingTime, -2);
                             if(date.compareTo(inParkingTime)<0){
                                 parkingRecord1.setOutParkingTime(null);
                                 parkingRecord1.setReleaseStatus("0");
-                                parkingRecord1.setRemark(parkingRecord1.getRemark()+"1分钟内出场");
+                                parkingRecord1.setRemark(parkingRecord1.getRemark()+"2分钟内出场");
                                 updateById(parkingRecord1);
                                 CarTypeVo carType = parkingMemberService.getCarType(license, parkingChannel.getParkId());
                                 responseAlarmInfoPlate.setInfo("");
                                 responseAlarmInfoPlate.setPlateid(plateId);
-                                responseAlarmInfoPlate.setSerialData(stringUtils.getSerialData(carType.getCarType() + license + "本次停车1分钟内不能出场", null, null, carType.getCarType() + license + "本次停车1分钟内不能出场", parkingChannel.getId(), true, true, 10L));
+                                responseAlarmInfoPlate.setSerialData(stringUtils.getSerialData(carType.getCarType() + license + "本次停车2分钟内不能出场", null, null, carType.getCarType() + license + "本次停车2分钟内不能出场", parkingChannel.getId(), true, true, 10L));
                                 map.put(ParkingConstant.RESPONSEKEY, responseAlarmInfoPlate);
                             }
                         }

+ 1 - 1
src/test/java/com/charging/chargingparking/ChargingParkingApplicationTests.java

@@ -453,7 +453,7 @@ class ChargingParkingApplicationTests {
     void contextLoads1111111111111111111111111111() {
 
         try {
-            ParkingRecord parkingRecord = parkingRecordService.getById("1716462570515304449");
+            ParkingRecord parkingRecord = parkingRecordService.getById("1720887329575505921");
             ParkingCostDTO parkingCostDTO  = parkingFeeService.parkingCost2(parkingRecord);
 
             System.out.println(parkingCostDTO);