From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/cmd/fee/CreateFeeByComboCmd.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/CreateFeeByComboCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/CreateFeeByComboCmd.java
index d9b32de..3e53dd8 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/CreateFeeByComboCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/CreateFeeByComboCmd.java
@@ -130,7 +130,7 @@
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
Assert.listOnlyOne(feeConfigDtos, "褰撳墠璐圭敤椤笽D涓嶅瓨鍦ㄦ垨瀛樺湪澶氭潯" + reqJson.getString("configId"));
- if (FeeDto.FEE_FLAG_ONCE.equals(feeConfigDtos.get(0).getFeeFlag()) && config.containsKey("endTime")) {
+ if (!FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag()) && config.containsKey("endTime")) {
Date endTime = null;
Date configEndTime = null;
try {
@@ -149,7 +149,7 @@
feePos.add(BeanConvertUtil.covertBean(addRoomFee(config, reqJson,feeConfigDtos), PayFeePo.class));
- if (FeeDto.FEE_FLAG_ONCE.equals(feeConfigDtos.get(0).getFeeFlag())) {
+ if (!FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())) {
feeAttrsPos.add(addFeeAttr(reqJson, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
config.containsKey("endTime") ? config.getString("endTime") : reqJson.getString("configEndTime")));
}
--
Gitblit v1.8.0