From 4dbf61c9189796ec46d39ac4b839cfc064e70411 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 12 八月 2021 16:11:16 +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 | 14 ++++----------
1 files changed, 4 insertions(+), 10 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 6c99036..b413d37 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
@@ -1241,7 +1241,6 @@
double oweMonth = 0.0;
Map<String, Object> targetEndDateAndOweMonth = new HashMap<>();
-
//鍒ゆ柇褰撳墠璐圭敤鏄惁宸茬粨鏉�
if (FeeDto.STATE_FINISH.equals(feeDto.getState())) {
targetEndDate = feeDto.getEndTime();
@@ -1263,7 +1262,6 @@
}
//鍒ゆ柇褰撳墠璐圭敤鏄笉鏄鍏ヨ垂鐢�
oweMonth = 1.0;
-
} else { //鍛ㄦ湡鎬ц垂鐢�
//褰撳墠鏃堕棿
Date billEndTime = DateUtil.getCurrentDate();
@@ -1271,7 +1269,6 @@
Date startDate = feeDto.getStartTime();
//璁¤垂璧峰鏃堕棿
Date endDate = feeDto.getEndTime();
-
//缂磋垂鍛ㄦ湡
long paymentCycle = Long.parseLong(feeDto.getPaymentCycle());
// 褰撳墠鏃堕棿 - 寮�濮嬫椂闂� = 鏈堜唤
@@ -1280,14 +1277,14 @@
// 鏈堜唤/ 鍛ㄦ湡 = 杞暟锛堝悜涓婂彇鏁达級
double round = 0.0;
- if ("1200".equals(feeDto.getPaymentCd())) { // 棰勪粯璐�
+ if ("1200".equals(feeDto.getPaymentCd())) { // 1200棰勪粯璐�
round = Math.floor(mulMonth / paymentCycle) + 1;
- } else { //鍚庝粯璐�
+ } else { //2100鍚庝粯璐�
round = Math.floor(mulMonth / paymentCycle);
}
// 杞暟 * 鍛ㄦ湡 * 30 + 寮�濮嬫椂闂� = 鐩爣 鍒版湡鏃堕棿
- targetEndDate = getTargetEndTime(round * paymentCycle, startDate);
- //璐圭敤 蹇粨鏉熶簡
+ targetEndDate = getTargetEndTime(round * paymentCycle, startDate);//鐩爣缁撴潫鏃堕棿
+ //璐圭敤椤圭殑缁撴潫鏃堕棿<缂磋垂鐨勭粨鏉熸椂闂� 璐圭敤蹇粨鏉熶簡 鍙栬垂鐢ㄩ」鐨勭粨鏉熸椂闂�
if (feeDto.getConfigEndTime().getTime() < targetEndDate.getTime()) {
targetEndDate = feeDto.getConfigEndTime();
}
@@ -1392,9 +1389,6 @@
if (doubleMonth <= 0) {
return endDate.getTime();
}
-// Calendar futureDate = Calendar.getInstance();
-// futureDate.setTime(endDate.getTime());
-// futureDate.add(Calendar.MONTH, 1);
int futureDay = endDate.getActualMaximum(Calendar.DAY_OF_MONTH);
Double hour = doubleMonth * futureDay * 24;
endDate.add(Calendar.HOUR_OF_DAY, hour.intValue());
--
Gitblit v1.8.0