计费时间

src/main/java/com/qmrb/system/service/impl/BarnRecordServiceImpl.java

@@ -124,6 +124,15 @@ public class BarnRecordServiceImpl extends ServiceImpl<BarnRecordMapper, BarnRec
             } else {
                 record.setParkingTime(calculateTimeDifference(record.getBillingStartTime(), new Date()));
             }
+            // 计费开始时间为null
+            if(record.getBillingStartTime() != null){
+                if (record.getOutTime() != null) {
+                    record.setParkingTime(calculateTimeDifference(record.getInTime(), record.getOutTime()));
+                } else {
+                    record.setParkingTime(calculateTimeDifference(record.getInTime(), new Date()));
+                }
+            }
+
             record.setPendingAmount(carParkChargingRulesService.calcuExpenses(record.getId(),record.getCarNumber(),false));
             if(record.getReceivedAmount() == null){
                 record.setReceivedAmount(BigDecimal.ZERO);
@@ -197,6 +206,15 @@ public class BarnRecordServiceImpl extends ServiceImpl<BarnRecordMapper, BarnRec
         } else {
             form.setParkingTime(calculateTimeDifference(form.getBillingStartTime(), new Date()));
         }
+        
+        // 计费开始时间为null
+        if(form.getBillingStartTime() != null){
+            if (form.getOutTime() != null) {
+                form.setParkingTime(calculateTimeDifference(form.getInTime(), form.getOutTime()));
+            } else {
+                form.setParkingTime(calculateTimeDifference(form.getInTime(), new Date()));
+            }
+        }
 
 
         List<CarPark> list = carParkService.list();