From 119fd2c1579afd051def413b93d01c7d9a6735f8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 08 九月 2023 19:15:02 +0800
Subject: [PATCH] 二维码支付加入 状态
---
java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java | 6 +++---
1 files changed, 3 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 5e72802..2087572 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
@@ -1767,7 +1767,7 @@
if (feeDto.getEndTime().getTime() > targetEndDate.getTime()) {
targetEndDate = feeDto.getEndTime();
}
- } else { //鍛ㄦ湡鎬ц垂鐢�
+ } else { // todo 鍛ㄦ湡鎬ц垂鐢�
//褰撳墠鏃堕棿
Date billEndTime = DateUtil.getCurrentDate();
//寤鸿处鏃堕棿
@@ -1778,7 +1778,7 @@
long paymentCycle = Long.parseLong(feeDto.getPaymentCycle());
// 褰撳墠鏃堕棿 - 寮�濮嬫椂闂� = 鏈堜唤
double mulMonth = 0.0;
- mulMonth = dayCompare(endDate, billEndTime);
+ mulMonth = dayCompare(startDate, billEndTime);
// 鏈堜唤/ 鍛ㄦ湡 = 杞暟锛堝悜涓婂彇鏁达級
double round = 0.0;
@@ -1788,7 +1788,7 @@
round = Math.floor(mulMonth / paymentCycle);
}
// 杞暟 * 鍛ㄦ湡 * 30 + 寮�濮嬫椂闂� = 鐩爣 鍒版湡鏃堕棿
- targetEndDate = getTargetEndTime(round * paymentCycle, endDate);//鐩爣缁撴潫鏃堕棿
+ targetEndDate = getTargetEndTime(round * paymentCycle, startDate);//鐩爣缁撴潫鏃堕棿
//todo 濡傛灉 鍒颁簡 棰勪粯鏈� 浜х敓涓嬩釜鍛ㄦ湡鐨勮垂鐢�
if (DateUtil.getFormatTimeStringB(targetEndDate).equals(DateUtil.getFormatTimeStringB(endDate))
--
Gitblit v1.8.0