From 5d19f731a7f3b9f55ebe66f6bcc2d1dae8870013 Mon Sep 17 00:00:00 2001
From: 颓废太子 <1098226878@qq.com>
Date: 星期三, 24 十一月 2021 10:26:07 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java b/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
index 27cece5..aae9a18 100755
--- a/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
+++ b/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
@@ -6,6 +6,8 @@
import com.java110.dto.contract.ContractDto;
import com.java110.dto.contractRoom.ContractRoomDto;
import com.java110.dto.fee.*;
+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.parking.ParkingSpaceDto;
@@ -16,6 +18,8 @@
import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.fee.ITempCarFeeConfigAttrInnerServiceSMO;
+import com.java110.intf.fee.ITempCarFeeConfigInnerServiceSMO;
import com.java110.intf.store.IContractInnerServiceSMO;
import com.java110.intf.store.IContractRoomInnerServiceSMO;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
@@ -75,6 +79,12 @@
@Autowired(required = false)
private IContractInnerServiceSMO contractInnerServiceSMOImpl;
+ @Autowired(required = false)
+ private ITempCarFeeConfigInnerServiceSMO tempCarFeeConfigInnerServiceSMOImpl;
+
+ @Autowired(required = false)
+ private ITempCarFeeConfigAttrInnerServiceSMO tempCarFeeConfigAttrInnerServiceSMOImpl;
+
@Override
public Date getFeeEndTime() {
return null;
@@ -93,6 +103,7 @@
public void computeEveryOweFee(FeeDto tmpFeeDto, RoomDto roomDto) {
computeFeePrice(tmpFeeDto, roomDto);
}
+
/**
* 璁＄畻娆犺垂閲戦
@@ -1511,6 +1522,21 @@
return resMonth;
}
+ /**
+ * 銆�銆� *瀛楃涓茬殑鏃ユ湡鏍煎紡鐨勮绠�
+ */
+ public long daysBetween(Date smdate, Date bdate) {
+ long between_days = 0;
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(smdate);
+ long time1 = cal.getTimeInMillis();
+ cal.setTime(bdate);
+ long time2 = cal.getTimeInMillis();
+ between_days = (time2 - time1) / (1000 * 3600 * 24);
+
+ return between_days;
+ }
+
@Override
public Date getTargetEndTime(double month, Date startDate) {
Calendar endDate = Calendar.getInstance();
@@ -1528,14 +1554,42 @@
return endDate.getTime();
}
+
+ @Override
+ public List<CarInoutDto> computeTempCarStopTimeAndFee(List<CarInoutDto> carInoutDtos) {
+
+ if (carInoutDtos == null || carInoutDtos.size() < 1) {
+ return null;
+ }
+
+
+ carInoutDtos = tempCarFeeConfigInnerServiceSMOImpl.computeTempCarFee(carInoutDtos);
+
+ return carInoutDtos;
+
+ }
+
+ @Override
+ public List<CarInoutDetailDto> computeTempCarInoutDetailStopTimeAndFee(List<CarInoutDetailDto> carInoutDtos) {
+ if (carInoutDtos == null || carInoutDtos.size() < 1) {
+ return null;
+ }
+
+
+ carInoutDtos = tempCarFeeConfigInnerServiceSMOImpl.computeTempCarInoutDetailFee(carInoutDtos);
+
+ return carInoutDtos;
+ }
+
+
public static void main(String[] args) {
ComputeFeeSMOImpl computeFeeSMO = new ComputeFeeSMOImpl();
try {
double month = computeFeeSMO.dayCompare(
- DateUtil.getDateFromString("2021-6-1 00:00:00", DateUtil.DATE_FORMATE_STRING_A),
- DateUtil.getDateFromString("2021-8-5 18:00:00", DateUtil.DATE_FORMATE_STRING_A)
+ DateUtil.getDateFromString("2021-09-30 14:20:02", DateUtil.DATE_FORMATE_STRING_A),
+ DateUtil.getDateFromString("2021-11-03 14:20:02", DateUtil.DATE_FORMATE_STRING_A)
);
- System.out.println(month);
+ System.out.println(Math.ceil(month));
} catch (ParseException e) {
e.printStackTrace();
}
--
Gitblit v1.8.0