From 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 七月 2023 10:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-core/src/main/java/com/java110/core/smo/IComputeFeeSMO.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 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
index d6bdc40..2c9fd5c 100755
--- 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,14 +1,17 @@
package com.java110.core.smo;
-import com.java110.dto.RoomDto;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.room.RoomDto;
import com.java110.dto.fee.FeeDto;
+import com.java110.dto.integral.IntegralRuleConfigDto;
+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;
-import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
+import com.java110.po.fee.FeeReceiptDetailPo;
import java.util.Date;
import java.util.List;
@@ -30,6 +33,13 @@
* @return
*/
Date getFeeEndTime();
+
+ /**
+ * 鑾峰彇 deadlineTime
+ * @param feeDto
+ * @return
+ */
+ Date getDeadlineTime(FeeDto feeDto);
/**
* 璁＄畻娆犺垂閲戦
@@ -138,6 +148,11 @@
*/
double dayCompare(Date fromDate, Date toDate);
+ /**
+ 銆�銆� *瀛楃涓茬殑鏃ユ湡鏍煎紡鐨勮绠�
+ 銆�銆� */
+ long daysBetween(Date smdate,Date bdate) ;
+
double getReportFeePrice(ReportFeeDto tmpReportFeeDto, ReportRoomDto reportRoomDto, ReportCarDto reportCarDto);
void computeEveryOweFee(FeeDto tmpFeeDto);
@@ -150,4 +165,35 @@
* @param carInoutDtos
*/
List<CarInoutDto> computeTempCarStopTimeAndFee(List<CarInoutDto> carInoutDtos);
+
+ /**
+ * 璁＄畻鍋滆溅鏃堕棿鍜岃垂鐢�
+ *
+ * @param carInoutDtos
+ */
+ List<CarInoutDetailDto> computeTempCarInoutDetailStopTimeAndFee(List<CarInoutDetailDto> carInoutDtos);
+
+ /**
+ * 绉熼噾澶勭悊
+ *
+ * @param feeDto
+ */
+ void dealRentRate(FeeDto feeDto);
+
+ /**
+ * 绉熼噾澶勭悊
+ *
+ * @param feeDto
+ */
+ void dealRentRateCycle(FeeDto feeDto,double cycle);
+
+
+ /**
+ * 绉熼噾澶勭悊
+ * @param feeDto
+ * @param custEndTime
+ */
+ void dealRentRateCustEndTime(FeeDto feeDto, Date custEndTime);
+
+ long computeOneIntegralQuantity(IntegralRuleConfigDto integralRuleConfigDto, JSONObject reqJson);
}
--
Gitblit v1.8.0