Merge remote-tracking branch 'origin/xinghong-dev'

java110

2021-04-01 3b0ddfa0b1c3490fbbf421a84e0431a60fb58387

 java110-core/src/main/java/com/java110/core/smo/IComputeFeeSMO.java

@@ -1,5 +1,6 @@
package com.java110.core.smo;

import com.java110.dto.RoomDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.report.ReportCarDto;
@@ -114,6 +115,9 @@
     */
    double getFeePrice(FeeDto feeDto);


    public double getFeePrice(FeeDto feeDto, RoomDto roomDto);

    /**
     * 时间差 按天折算
     *
@@ -126,4 +130,5 @@
    double getReportFeePrice(ReportFeeDto tmpReportFeeDto, ReportRoomDto reportRoomDto, ReportCarDto reportCarDto);

    void computeEveryOweFee(FeeDto tmpFeeDto);
    void computeEveryOweFee(FeeDto tmpFeeDto, RoomDto roomDto);
}