From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java
index 3c4e3f0..c80178f 100755
--- a/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java
@@ -140,12 +140,16 @@
}
String cycel = null;
String custEndTime = null;
+ String customStartTime = "";
+ String customEndTime = "";
if (!StringUtil.isEmpty(feeDto.getCycle())) {
cycel = feeDto.getCycle();
}
if (!StringUtil.isEmpty(feeDto.getCustEndTime())) {
custEndTime = feeDto.getCustEndTime();
}
+ customStartTime = feeDto.getCustomStartTime();
+ customEndTime = feeDto.getCustomEndTime();
feeDto = feeDtos.get(0);
if (!StringUtil.isEmpty(cycel)) {
feeDto.setCycle(cycel);
@@ -154,6 +158,9 @@
feeDto.setCustEndTime(custEndTime);
}
+ feeDto.setCustomStartTime(customStartTime);
+ feeDto.setCustomEndTime(customEndTime);
+
if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDto.getPayerObjType())) { //鎴垮眿鐩稿叧
RoomDto roomDto = new RoomDto();
roomDto.setRoomId(feeDto.getPayerObjId());
--
Gitblit v1.8.0