计费时间

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

@@ -110,9 +110,9 @@ public class BarnRecordServiceImpl extends ServiceImpl<BarnRecordMapper, BarnRec
                 record.setCarParkName(map.get(record.getCarParkId()));
             }
             if (record.getOutTime() != null) {
-                record.setParkingTime(calculateTimeDifference(record.getInTime(), record.getOutTime()));
+                record.setParkingTime(calculateTimeDifference(record.getBillingStartTime(), record.getOutTime()));
             } else {
-                record.setParkingTime(calculateTimeDifference(record.getInTime(), new Date()));
+                record.setParkingTime(calculateTimeDifference(record.getBillingStartTime(), new Date()));
             }
             record.setPendingAmount(carParkChargingRulesService.calcuExpenses(record.getId(),record.getCarNumber(),false));
             if(record.getReceivedAmount() == null){
@@ -183,9 +183,9 @@ public class BarnRecordServiceImpl extends ServiceImpl<BarnRecordMapper, BarnRec
         BarnRecordForm form = converter.entity2Form(entity);
 
         if (form.getOutTime() != null) {
-            form.setParkingTime(calculateTimeDifference(form.getInTime(), form.getOutTime()));
+            form.setParkingTime(calculateTimeDifference(form.getBillingStartTime(), form.getOutTime()));
         } else {
-            form.setParkingTime(calculateTimeDifference(form.getInTime(), new Date()));
+            form.setParkingTime(calculateTimeDifference(form.getBillingStartTime(), new Date()));
         }