From 89e62ac67a77826e6b71c31a8136f483bc891d3b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 23 六月 2022 15:40:09 +0800
Subject: [PATCH] 优化 间接性费用功能
---
service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java
index dfc9dcd..e8a1962 100755
--- a/service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java
@@ -337,10 +337,13 @@
if (FeeDto.FEE_FLAG_ONCE.equals(feeInfo.getFeeFlag())) { //缂磋垂缁撴潫
feeMap.put("state", FeeDto.STATE_FINISH);
}
+ Date maxEndTime = feeInfo.getConfigEndTime();
+ if(!FeeDto.FEE_FLAG_CYCLE.equals(feeInfo.getFeeFlag())){
+ maxEndTime = feeInfo.getDeadlineTime();
+ }
try {
Date endTime = DateUtil.getDateFromString(paramInJson.getString("endTime"), DateUtil.DATE_FORMATE_STRING_A);
- Date configEndTime = feeInfo.getConfigEndTime();
- if (endTime.getTime() >= configEndTime.getTime()) {
+ if (endTime.getTime() >= maxEndTime.getTime()) {
feeMap.put("state", FeeDto.STATE_FINISH);
}
} catch (ParseException e) {
--
Gitblit v1.8.0