From c74a42b5c4e2a8803eeb4dfbdd4863968c81c0a5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 15 十二月 2020 18:57:03 +0800
Subject: [PATCH] 优化欠费缴费完成
---
service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 fd82ef9..2779d4d 100644
--- 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
@@ -37,6 +37,7 @@
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
+import java.text.ParseException;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -370,7 +371,18 @@
feeMap.put("endTime", paramInJson.getString("endTime"));
feeMap.put("cycles", paramInJson.getString("cycles"));
feeMap.put("configEndTime", feeInfo.getConfigEndTime());
-
+ if (FeeDto.FEE_FLAG_ONCE.equals(feeInfo.getFeeFlag())) { //缂磋垂缁撴潫
+ feeMap.put("state", FeeDto.STATE_FINISH);
+ }
+ try {
+ Date endTime = DateUtil.getDateFromString(paramInJson.getString("endTime"), DateUtil.DATE_FORMATE_STRING_A);
+ Date configEndTime = feeInfo.getConfigEndTime();
+ if (endTime.getTime() >= configEndTime.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);
--
Gitblit v1.8.0