From 22e8a676ee42c0d78b3526bcd9a635abbe8dca03 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 28 六月 2022 11:28:21 +0800
Subject: [PATCH] 优化databus bug
---
java110-core/src/main/java/com/java110/core/smo/IComputeFeeSMO.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 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 71e9363..ddc6d0d
--- a/java110-core/src/main/java/com/java110/core/smo/IComputeFeeSMO.java
+++ b/java110-core/src/main/java/com/java110/core/smo/IComputeFeeSMO.java
@@ -2,7 +2,10 @@
import com.java110.dto.RoomDto;
import com.java110.dto.fee.FeeDto;
+import com.java110.dto.machine.CarInoutDetailDto;
+import com.java110.dto.machine.CarInoutDto;
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;
@@ -62,7 +65,16 @@
public String getFeeObjName(FeeDto feeDto);
/**
+ * 鏌ヨ璐圭敤鐨勪笟涓讳俊鎭�
+ *
+ * @param feeDto
+ * @return
+ */
+ public OwnerDto getFeeOwnerDto(FeeDto feeDto);
+
+ /**
* 鍒峰叆 浠樿垂鏂瑰悕绉�
+ *
* @param feeDtos
*/
public void freshFeeObjName(List<FeeDto> feeDtos);
@@ -113,10 +125,10 @@
*
* @return
*/
- double getFeePrice(FeeDto feeDto);
+ public Map getFeePrice(FeeDto feeDto);
- public double getFeePrice(FeeDto feeDto, RoomDto roomDto);
+ public Map getFeePrice(FeeDto feeDto, RoomDto roomDto);
/**
* 鏃堕棿宸� 鎸夊ぉ鎶樼畻
@@ -127,8 +139,28 @@
*/
double dayCompare(Date fromDate, Date toDate);
+ /**
+ 銆�銆� *瀛楃涓茬殑鏃ユ湡鏍煎紡鐨勮绠�
+ 銆�銆� */
+ long daysBetween(Date smdate,Date bdate) ;
+
double getReportFeePrice(ReportFeeDto tmpReportFeeDto, ReportRoomDto reportRoomDto, ReportCarDto reportCarDto);
void computeEveryOweFee(FeeDto tmpFeeDto);
+
void computeEveryOweFee(FeeDto tmpFeeDto, RoomDto roomDto);
+
+ /**
+ * 璁＄畻鍋滆溅鏃堕棿鍜岃垂鐢�
+ *
+ * @param carInoutDtos
+ */
+ List<CarInoutDto> computeTempCarStopTimeAndFee(List<CarInoutDto> carInoutDtos);
+
+ /**
+ * 璁＄畻鍋滆溅鏃堕棿鍜岃垂鐢�
+ *
+ * @param carInoutDtos
+ */
+ List<CarInoutDetailDto> computeTempCarInoutDetailStopTimeAndFee(List<CarInoutDetailDto> carInoutDtos);
}
--
Gitblit v1.8.0