From 5455344826507f875fa4757d775142ee53658e1e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 25 七月 2022 14:46:25 +0800
Subject: [PATCH] 优化 欠费缴费时 的 数据问题 导致程序异常问题

---
 service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java
index 84c23a2..6128738 100644
--- a/service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java
@@ -345,16 +345,14 @@
             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);

--
Gitblit v1.8.0