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/impl/ComputeFeeSMOImpl.java | 62 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 29 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 1aec4cc..6c99036 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
@@ -1230,18 +1230,26 @@
}
+ /**
+ * 璁＄畻 璁¤垂缁撴潫鏃堕棿鍜� 娆犺垂鏈堜唤锛堝彲鑳藉瓨鍦ㄥ皬鏁扮偣锛�
+ * @param feeDto
+ * @param ownerCarDto
+ * @return
+ */
public Map getTargetEndDateAndOweMonth(FeeDto feeDto, OwnerCarDto ownerCarDto) {
Date targetEndDate = null;
double oweMonth = 0.0;
Map<String, Object> targetEndDateAndOweMonth = new HashMap<>();
+ //鍒ゆ柇褰撳墠璐圭敤鏄惁宸茬粨鏉�
if (FeeDto.STATE_FINISH.equals(feeDto.getState())) {
targetEndDate = feeDto.getEndTime();
targetEndDateAndOweMonth.put("oweMonth", oweMonth);
targetEndDateAndOweMonth.put("targetEndDate", targetEndDate);
return targetEndDateAndOweMonth;
}
+ //褰撳墠璐圭敤涓轰竴娆℃�ц垂鐢�
if (FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())) {
//鍏堝彇 deadlineTime
if (feeDto.getDeadlineTime() != null) {
@@ -1256,29 +1264,13 @@
//鍒ゆ柇褰撳墠璐圭敤鏄笉鏄鍏ヨ垂鐢�
oweMonth = 1.0;
- } else {
+ } else { //鍛ㄦ湡鎬ц垂鐢�
//褰撳墠鏃堕棿
Date billEndTime = DateUtil.getCurrentDate();
- //寮�濮嬫椂闂�
+ //寤鸿处鏃堕棿
Date startDate = feeDto.getStartTime();
- //鍒版湡鏃堕棿
+ //璁¤垂璧峰鏃堕棿
Date endDate = feeDto.getEndTime();
-// if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {
-// if (ownerCarDto == null) {
-// targetEndDateAndOweMonth.put("oweMonth", 0);
-// targetEndDateAndOweMonth.put("targetEndDate", "");
-// return targetEndDateAndOweMonth;
-// }
-// targetEndDate = ownerCarDto.getEndTime();
-// //璇存槑娌℃湁娆犺垂
-// if (endDate.getTime() >= targetEndDate.getTime()) {
-// // 鐩爣鍒版湡鏃堕棿 - 鍒版湡鏃堕棿 = 娆犺垂鏈堜唤
-// oweMonth = 0;
-// targetEndDateAndOweMonth.put("oweMonth", oweMonth);
-// targetEndDateAndOweMonth.put("targetEndDate", targetEndDate);
-// return targetEndDateAndOweMonth;
-// }
-// }
//缂磋垂鍛ㄦ湡
long paymentCycle = Long.parseLong(feeDto.getPaymentCycle());
@@ -1299,7 +1291,7 @@
if (feeDto.getConfigEndTime().getTime() < targetEndDate.getTime()) {
targetEndDate = feeDto.getConfigEndTime();
}
- //璇存槑娌℃湁娆犺垂
+ //璇存槑娆犺垂
if (endDate.getTime() < targetEndDate.getTime()) {
// 鐩爣鍒版湡鏃堕棿 - 鍒版湡鏃堕棿 = 娆犺垂鏈堜唤
oweMonth = dayCompare(endDate, targetEndDate);
@@ -1327,6 +1319,12 @@
return getTargetEndDateAndOweMonth(feeDto, null);
}
+ /**
+ * 璁＄畻 涓や釜鏃堕棿鐐规湀浠�
+ * @param fromDate 寮�濮嬫椂闂�
+ * @param toDate 缁撴潫鏃堕棿
+ * @return
+ */
@Override
public double dayCompare(Date fromDate, Date toDate) {
double resMonth = 0.0;
@@ -1334,31 +1332,39 @@
from.setTime(fromDate);
Calendar to = Calendar.getInstance();
to.setTime(toDate);
+ //姣旇緝鏈堜唤宸� 鍙兘鏈夋暣鏁� 涔熶細璐熸暟
int result = to.get(Calendar.MONTH) - from.get(Calendar.MONTH);
+ //姣旇緝骞村樊
int month = (to.get(Calendar.YEAR) - from.get(Calendar.YEAR)) * 12;
+ //鐪熷疄 鐩稿樊鏈堜唤
result = result + month;
+
+ //寮�濮嬫椂闂� 2021-06-01 2021-08-05 result = 2 2021-08-01
Calendar newFrom = Calendar.getInstance();
newFrom.setTime(fromDate);
newFrom.add(Calendar.MONTH, result);
- //濡傛灉鍔犳湀浠藉悗 澶т簬浜嗗埌鏈熸椂闂� 榛樿鍔� 鏈堜唤 -1 鎯呭喌 12-19 21-01-10
+ //濡傛灉鍔犳湀浠藉悗 澶т簬浜嗗綋鍓嶆椂闂� 榛樿鍔� 鏈堜唤 -1 鎯呭喌 12-19 21-01-10
+ //杩欎釜鏄鐨勯�昏緫涓�瀹氬ソ濂界悊瑙�
if (newFrom.getTime().getTime() > toDate.getTime()) {
newFrom.setTime(fromDate);
result = result - 1;
newFrom.add(Calendar.MONTH, result);
}
+ // t1 2021-08-01 t2 2021-08-05
long t1 = newFrom.getTime().getTime();
long t2 = to.getTime().getTime();
+ //鐩稿樊姣
double days = (t2 - t1) * 1.00 / (24 * 60 * 60 * 1000);
- BigDecimal tmpDays = new BigDecimal(days);
+ BigDecimal tmpDays = new BigDecimal(days); //鐩稿樊澶╂暟
BigDecimal monthDay = null;
Calendar newFromMaxDay = Calendar.getInstance();
newFromMaxDay.set(newFrom.get(Calendar.YEAR), newFrom.get(Calendar.MONTH), 1, 0, 0, 0);
- newFromMaxDay.add(Calendar.MONTH, 1);
- //鍦ㄥ綋鍓嶆湀涓�
+ newFromMaxDay.add(Calendar.MONTH, 1); //涓嬩釜鏈�1鍙�
+ //鍦ㄥ綋鍓嶆湀涓� 杩欏潡鏈夐棶棰�
if (toDate.getTime() < newFromMaxDay.getTime().getTime()) {
- monthDay = new BigDecimal(newFromMaxDay.getActualMaximum(Calendar.DAY_OF_MONTH));
+ monthDay = new BigDecimal(newFrom.getActualMaximum(Calendar.DAY_OF_MONTH));
return tmpDays.divide(monthDay, 2, BigDecimal.ROUND_HALF_UP).add(new BigDecimal(result)).doubleValue();
}
// 涓婃湀澶╂暟
@@ -1399,11 +1405,9 @@
ComputeFeeSMOImpl computeFeeSMO = new ComputeFeeSMOImpl();
try {
double month = computeFeeSMO.dayCompare(
-
- DateUtil.getDateFromString("2020-12-19 00:00:00", DateUtil.DATE_FORMATE_STRING_A),
- DateUtil.getDateFromString("2021-1-10 00:00:00", DateUtil.DATE_FORMATE_STRING_A)
+ 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)
);
-
System.out.println(month);
} catch (ParseException e) {
e.printStackTrace();
--
Gitblit v1.8.0