From e23023b93f34286f5a807b0b85e9a0619a297ed7 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 21 二月 2023 23:25:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportCustomCreateFeeSMOImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportCustomCreateFeeSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportCustomCreateFeeSMOImpl.java
index ff8b3fc..29e8c91 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportCustomCreateFeeSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportCustomCreateFeeSMOImpl.java
@@ -151,16 +151,16 @@
tmpImportCustomCreateFeeDtos.add(importCustomCreateFeeDtos.get(roomIndex));
if (roomIndex % DEFAULT_ADD_FEE_COUNT == 0 && roomIndex != 0) {
// 澶勭悊鎴垮眿璐圭敤
- doImportRoomCreateFee(importCustomCreateFeeDtos, batchId, result);
- doImportCarCreateFee(importCustomCreateFeeDtos, batchId, result);
+ doImportRoomCreateFee(tmpImportCustomCreateFeeDtos, batchId, result);
+ doImportCarCreateFee(tmpImportCustomCreateFeeDtos, batchId, result);
tmpImportCustomCreateFeeDtos = new ArrayList<>();
}
}
if (tmpImportCustomCreateFeeDtos != null && tmpImportCustomCreateFeeDtos.size() > 0) {
- doImportRoomCreateFee(importCustomCreateFeeDtos, batchId, result);
- doImportCarCreateFee(importCustomCreateFeeDtos, batchId, result);
+ doImportRoomCreateFee(tmpImportCustomCreateFeeDtos, batchId, result);
+ doImportCarCreateFee(tmpImportCustomCreateFeeDtos, batchId, result);
}
@@ -278,7 +278,7 @@
payFeePo.setUserId(result.getUserId());
payFeePo.setIncomeObjId(result.getStoreId());
payFeePo.setFeeTypeCd(feeConfigDtos.get(0).getFeeTypeCd());
- payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
+ payFeePo.setFeeFlag(feeConfigDtos.get(0).getFeeFlag());
payFeePo.setAmount("-1");
payFeePo.setBatchId(batchId);
payFeePo.setEndTime(importRoomFee.getStartTime());
--
Gitblit v1.8.0