From b8e7bb1791ff41be5ee8150cc46af082d7444a65 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 31 五月 2023 01:02:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/bmo/payFeeDetail/impl/ImportPayFeeDetailBMOImpl.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/payFeeDetail/impl/ImportPayFeeDetailBMOImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/payFeeDetail/impl/ImportPayFeeDetailBMOImpl.java
index e8e8781..01cebfd 100755
--- a/service-fee/src/main/java/com/java110/fee/bmo/payFeeDetail/impl/ImportPayFeeDetailBMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/payFeeDetail/impl/ImportPayFeeDetailBMOImpl.java
@@ -30,6 +30,7 @@
import java.text.ParseException;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.List;
@Service("importPayFeeDetailBMOImpl")
@@ -102,6 +103,10 @@
if (StringUtil.isEmpty(importRoomFee.getRoomId())) {
continue;
}
+
+ String endTime = importRoomFee.getEndTime();
+
+
importFeeDetail(importRoomFee, storeId, userId, batchId);
}
}
@@ -318,6 +323,15 @@
payFeeDetailPo.setPrimeRate("1.0");
payFeeDetailPo.setFeeId(tmpFeeDto.getFeeId());
payFeeDetailPo.setStartTime(importRoomFee.getStartTime());
+ String endTime = importRoomFee.getEndTime();
+ //todo 鍛ㄦ湡鎬ц垂鐢ㄦ椂鏃堕棿鑷姩鍔犱竴澶╋紝鍥犱负鐗╀笟缁熻鐨凟xcel 涓�鑸皯涓�澶�
+ if (!FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag())) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(DateUtil.getDateFromStringB(endTime));
+ calendar.add(Calendar.DAY_OF_MONTH, 1);
+ endTime = DateUtil.getFormatTimeStringB(calendar.getTime());
+ importRoomFee.setEndTime(endTime);
+ }
payFeeDetailPo.setEndTime(importRoomFee.getEndTime());
payFeeDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
payFeeDetailPo.setRemark(importRoomFee.getRemark());
--
Gitblit v1.8.0