From 76088a1a46cbbc05fc92ad8d982b0dcb0da87cb2 Mon Sep 17 00:00:00 2001
From: cgf <2156125618@qq.com>
Date: 星期三, 10 九月 2025 09:58:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
service-fee/src/main/java/com/java110/fee/bmo/fee/impl/FeeBMOImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 de1d479..11e922d 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
@@ -138,7 +138,13 @@
// endCalender.add(Calendar.HOUR, hours);
endCalender = getTargetEndTime(endCalender, Double.parseDouble(paramInJson.getString("tmpCycles")));
} else {
- endCalender.add(Calendar.MONTH, Integer.parseInt(paramInJson.getString("cycles")));
+ if (paramInJson.containsKey("custEndTimeUse")){
+ endCalender.setTime(DateUtil.getDateFromStringA(paramInJson.getString("custEndTimeUse")+" 23:59:59"));
+ }
+ else{
+ endCalender.add(Calendar.MONTH, new BigDecimal(paramInJson.getString("cycles")).intValue());
+ endCalender.add(Calendar.MINUTE, -1);
+ }
if (FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())) {
if (feeDto.getDeadlineTime() != null) {
endCalender.setTime(feeDto.getDeadlineTime());
@@ -216,7 +222,12 @@
Date endTime = feeInfo.getEndTime();
Calendar endCalender = Calendar.getInstance();
endCalender.setTime(endTime);
- endCalender.add(Calendar.MONTH, Integer.parseInt(paramInJson.getString("cycles")));
+ if (paramInJson.containsKey("custEndTimeUse")){
+ endCalender.setTime(DateUtil.getDateFromStringA(paramInJson.getString("custEndTimeUse")+" 23:59:59"));
+ endCalender.add(Calendar.MINUTE, 1);
+ }else{
+ endCalender.add(Calendar.MONTH, Integer.parseInt(paramInJson.getString("cycles")));
+ }
if (FeeDto.FEE_FLAG_ONCE.equals(feeInfo.getFeeFlag())) {
if (feeInfo.getDeadlineTime() != null) {
endCalender.setTime(feeInfo.getDeadlineTime());
--
Gitblit v1.8.0