| | |
| | | }else{ |
| | | tParkingRecordVO.setFeeDuration(tParkingRecordVO.getParkingDuration()-tParkingRecordVO.getFreeDuration()); |
| | | } |
| | | tParkingRecordVO.setOrderAmount(tParkingRecordVO.getOrderAmount().add(tParkingRecordVO.getTimeoutAmount())); |
| | | tParkingRecordVO.setOrderAmount(tParkingRecordVO.getOrderAmount()!=null?tParkingRecordVO.getOrderAmount():new BigDecimal("0") |
| | | .add(tParkingRecordVO.getTimeoutAmount()!=null?tParkingRecordVO.getTimeoutAmount():new BigDecimal("0"))); |
| | | tParkingRecordVO.setParkingFee(tParkingRecordVO.getOrderAmount()); |
| | | } |
| | | pageInfo.setRecords(list); |