From d6c57faee4911e3dc6bcb224a071796904c74e14 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 17 五月 2023 19:11:44 +0800
Subject: [PATCH] optimize pay fee detail to month
---
service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java b/service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java
index 7b2f223..89aa01b 100644
--- a/service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java
+++ b/service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java
@@ -164,12 +164,19 @@
Map<String, MonthFeeDetailDto> monthFeeDetailDtos = new HashMap<>();
for (FeeDetailDto feeDetailDto : feeDetailDtos) {
+ Date endTime = feeDetailDto.getEndTime();
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(endTime);
+ calendar.add(Calendar.DAY_OF_MONTH,-1);
+ if(feeDetailDto.getStartTime().getTime()< calendar.getTime().getTime()){
+ endTime = calendar.getTime();
+ }
//璁＄畻涓や釜鏃ユ湡鍖呭惈鐨勬湀浠�
- List<String> months = DateUtil.getMonthBetweenDate(feeDetailDto.getStartTime(), feeDetailDto.getEndTime());
+ List<String> months = DateUtil.getMonthBetweenDate(feeDetailDto.getStartTime(), endTime);
if (months == null || months.size() < 1) {
putReceivedAmountToMonthFeeDetailDtos(monthFeeDetailDtos,
- DateUtil.getFormatTimeString(feeDetailDto.getStartTime(), DateUtil.DATE_FORMATE_STRING_M),
+ DateUtil.getFormatTimeString(feeDetailDto.getStartTime(), DateUtil.DATE_FORMATE_STRING_Q),
Double.parseDouble(feeDetailDto.getReceivedAmount()),
feeDetailDto);
continue;
--
Gitblit v1.8.0