From 3b0ddfa0b1c3490fbbf421a84e0431a60fb58387 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 01 四月 2021 12:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
java110-core/src/main/java/com/java110/core/smo/IComputeFeeSMO.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 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
index c75455e..71e9363 100644
--- 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,9 +1,15 @@
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;
+import com.java110.dto.report.ReportFeeDto;
+import com.java110.dto.report.ReportRoomDto;
import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
import java.util.Date;
+import java.util.List;
import java.util.Map;
/**
@@ -24,7 +30,15 @@
Date getFeeEndTime();
/**
+ * 璁＄畻娆犺垂閲戦
+ *
+ * @param tmpFeeDto
+ */
+ public void computeOweFee(FeeDto tmpFeeDto);
+
+ /**
* 鍒锋柊
+ *
* @param feeDto
* @param feeReceiptDetailPo
*/
@@ -32,6 +46,7 @@
/**
* 鏍规嵁鍛ㄦ湡 璁＄畻璐圭敤鐘舵��
+ *
* @param feeDto
* @param cycles
* @return
@@ -40,12 +55,21 @@
/**
* 鏌ヨ璐圭敤瀵硅薄鍚嶇О
+ *
* @param feeDto
* @return
*/
public String getFeeObjName(FeeDto feeDto);
+
+ /**
+ * 鍒峰叆 浠樿垂鏂瑰悕绉�
+ * @param feeDtos
+ */
+ public void freshFeeObjName(List<FeeDto> feeDtos);
+
/**
* 鏍规嵁缂磋垂鍛ㄦ湡璁＄畻 缁撴潫鏃堕棿
+ *
* @param feeDto
* @param cycles 缂磋垂鍛ㄦ湡
* @return
@@ -70,6 +94,8 @@
*/
double getCycle();
+ public Map getTargetEndDateAndOweMonth(FeeDto feeDto, OwnerCarDto ownerCarDto);
+
/**
* 鑾峰彇鐩爣缁撴潫鏃堕棿鍜屾瑺璐规湀浠�
*
@@ -89,6 +115,9 @@
*/
double getFeePrice(FeeDto feeDto);
+
+ public double getFeePrice(FeeDto feeDto, RoomDto roomDto);
+
/**
* 鏃堕棿宸� 鎸夊ぉ鎶樼畻
*
@@ -98,4 +127,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