From bee468d744d626b5aa27004ecf1a96892eb3fe79 Mon Sep 17 00:00:00 2001
From: 1098226878 <1098226878@qq.com>
Date: 星期四, 05 八月 2021 18:27:36 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-core/src/main/java/com/java110/core/smo/IComputeFeeSMO.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/java110-core/src/main/java/com/java110/core/smo/IComputeFeeSMO.java b/java110-core/src/main/java/com/java110/core/smo/IComputeFeeSMO.java
old mode 100644
new mode 100755
index 127073b..e028703
--- a/java110-core/src/main/java/com/java110/core/smo/IComputeFeeSMO.java
+++ b/java110-core/src/main/java/com/java110/core/smo/IComputeFeeSMO.java
@@ -1,6 +1,9 @@
 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.owner.OwnerDto;
 import com.java110.dto.report.ReportCarDto;
 import com.java110.dto.report.ReportFeeDto;
 import com.java110.dto.report.ReportRoomDto;
@@ -60,6 +63,13 @@
     public String getFeeObjName(FeeDto feeDto);
 
     /**
+     * 鏌ヨ璐圭敤鐨勪笟涓讳俊鎭�
+     * @param feeDto
+     * @return
+     */
+    public OwnerDto getFeeOwnerDto(FeeDto feeDto);
+
+    /**
      * 鍒峰叆 浠樿垂鏂瑰悕绉�
      * @param feeDtos
      */
@@ -92,6 +102,8 @@
      */
     double getCycle();
 
+    public Map getTargetEndDateAndOweMonth(FeeDto feeDto, OwnerCarDto ownerCarDto);
+
     /**
      * 鑾峰彇鐩爣缁撴潫鏃堕棿鍜屾瑺璐规湀浠�
      *
@@ -111,6 +123,9 @@
      */
     double getFeePrice(FeeDto feeDto);
 
+
+    public double getFeePrice(FeeDto feeDto, RoomDto roomDto);
+
     /**
      * 鏃堕棿宸� 鎸夊ぉ鎶樼畻
      *
@@ -121,4 +136,8 @@
     double dayCompare(Date fromDate, Date toDate);
 
     double getReportFeePrice(ReportFeeDto tmpReportFeeDto, ReportRoomDto reportRoomDto, ReportCarDto reportCarDto);
+
+    void computeEveryOweFee(FeeDto tmpFeeDto);
+
+    void computeEveryOweFee(FeeDto tmpFeeDto, RoomDto roomDto);
 }

--
Gitblit v1.8.0