From 675ccd51874f9c005285eab3e4829e451848b4b6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 07 六月 2023 11:11:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 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 e8a1962..13bb76b 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
@@ -338,17 +338,16 @@
feeMap.put("state", FeeDto.STATE_FINISH);
}
Date maxEndTime = feeInfo.getConfigEndTime();
- if(!FeeDto.FEE_FLAG_CYCLE.equals(feeInfo.getFeeFlag())){
+ if (!FeeDto.FEE_FLAG_CYCLE.equals(feeInfo.getFeeFlag())) {
maxEndTime = feeInfo.getDeadlineTime();
}
- try {
- Date endTime = DateUtil.getDateFromString(paramInJson.getString("endTime"), DateUtil.DATE_FORMATE_STRING_A);
+ if(maxEndTime != null) { //杩欓噷鏁版嵁闂鐨勬儏鍐典笅
+ Date endTime = DateUtil.getDateFromStringA(paramInJson.getString("endTime"));
if (endTime.getTime() >= maxEndTime.getTime()) {
feeMap.put("state", FeeDto.STATE_FINISH);
}
- } catch (ParseException e) {
- throw new IllegalArgumentException("缂磋垂寮傚父" + e);
}
+
businessFee.putAll(feeMap);
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeePo.class.getSimpleName(), businessFee);
return business;
--
Gitblit v1.8.0