From 8f61316069a6ffffb0998ed3f498bd4e3acc77e4 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 五月 2022 11:36:15 +0800
Subject: [PATCH] 优化 费用
---
service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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 026e332..69121c3 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
@@ -28,9 +28,7 @@
import com.java110.po.fee.PayFeePo;
import com.java110.po.feeReceipt.FeeReceiptPo;
import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
-import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.CommonConstant;
-import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.constant.*;
import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -472,6 +470,20 @@
paramInJson.put("carFeeEndTime", feeInfo.getEndTime());
paramInJson.put("carPayerObjType", feeInfo.getPayerObjType());
paramInJson.put("carPayerObjId", feeInfo.getPayerObjId());
+
+ // 鍛ㄦ湡鎬ф敹璐广�佺即璐瑰悗锛屽埌鏈熸棩鏈熷湪璐圭敤椤圭粓姝㈡棩鏈熷悗锛屽垯璁剧疆缂磋垂鐘舵�佺粨鏉燂紝璁剧疆缁撴潫鏃ユ湡涓鸿垂鐢ㄩ」缁堟鏃ユ湡
+ if (FeeFlagTypeConstant.CYCLE.equals(feeInfo.getFeeFlag())) {
+ //杩欓噷 瀹归敊浜斿ぉ鏃堕棿
+ Date configEndTime = feeInfo.getConfigEndTime();
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(configEndTime);
+ calendar.add(Calendar.DAY_OF_MONTH, -5);
+ configEndTime = calendar.getTime();
+ if (feeInfo.getEndTime().after(configEndTime)) {
+ businessFee.put("state", FeeStateConstant.END);
+ businessFee.put("endTime", feeInfo.getConfigEndTime());
+ }
+ }
return paramInJson;
}
--
Gitblit v1.8.0