Merge branch 'master' of http://8.138.18.76:3000/qmrb/parking-server

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

@@ -119,19 +119,16 @@ public class BarnRecordServiceImpl extends ServiceImpl<BarnRecordMapper, BarnRec
             if (record.getCarParkId() != null && map.keySet().contains(record.getCarParkId())) {
                 record.setCarParkName(map.get(record.getCarParkId()));
             }
+
+            if(record.getBillingStartTime() == null){
+                record.setBillingStartTime(new Date());
+            }
+            // 计算计费时长
             if (record.getOutTime() != null) {
                 record.setParkingTime(calculateTimeDifference(record.getBillingStartTime(), record.getOutTime()));
             } 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){
@@ -209,20 +206,16 @@ public class BarnRecordServiceImpl extends ServiceImpl<BarnRecordMapper, BarnRec
         // 实体转换
         BarnRecordForm form = converter.entity2Form(entity);
 
+        if(form.getBillingStartTime() == null){
+            form.setBillingStartTime(new Date());
+        }
+        // 计算计费时长
         if (form.getOutTime() != null) {
             form.setParkingTime(calculateTimeDifference(form.getBillingStartTime(), form.getOutTime()));
         } 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();