计费

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

@@ -115,6 +115,9 @@ public class BarnRecordServiceImpl extends ServiceImpl<BarnRecordMapper, BarnRec
                 record.setParkingTime(calculateTimeDifference(record.getInTime(), new Date()));
             }
             record.setPendingAmount(carParkChargingRulesService.calcuExpenses(record.getId(),record.getCarNumber()));
+            if(record.getReceivedAmount() == null){
+                record.setReceivedAmount(BigDecimal.ZERO);
+            }
             if(record.getPendingAmount() != null){
                 record.setBillingAmount(record.getReceivedAmount().add(record.getPendingAmount()));
             }else{
@@ -196,9 +199,17 @@ public class BarnRecordServiceImpl extends ServiceImpl<BarnRecordMapper, BarnRec
         if (form.getCarParkId() != null && map.keySet().contains(form.getCarParkId())) {
             form.setCarParkName(map.get(form.getCarParkId()));
         }
-        form.setPendingAmount(new BigDecimal(15));
-        form.setBillingAmount(new BigDecimal(15));
-        form.setReceivedAmount(BigDecimal.ZERO);
+
+        if(form.getReceivedAmount() == null){
+            form.setReceivedAmount(BigDecimal.ZERO);
+        }
+        // 计费
+        form.setPendingAmount(carParkChargingRulesService.calcuExpenses(form.getId(),form.getCarNumber()));//待收金额
+        if(form.getPendingAmount() != null){
+            form.setBillingAmount(form.getReceivedAmount().add(form.getPendingAmount()));//计费金额
+        }else{
+            form.setBillingAmount(form.getReceivedAmount());//计费金额
+        }
         return form;
     }