From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java
index 9278dde..d4261ec 100755
--- a/service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java
@@ -118,13 +118,17 @@
feeName = IMPORT_FEE_NAME;
}
- if(!StringUtil.isEmpty(feeName)){
+ if (!StringUtil.isEmpty(feeName)) {
feeName = feeName.trim();
}
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setFeeTypeCd(feeTypeCd);
- feeConfigDto.setFeeNameEq(feeName);
+ if (!StringUtil.isEmpty(tmpImportRoomFees.get(0).getConfigId())) {
+ feeConfigDto.setConfigId(tmpImportRoomFees.get(0).getConfigId());
+ } else {
+ feeConfigDto.setFeeNameEq(feeName);
+ }
feeConfigDto.setComputingFormula(FeeConfigDto.COMPUTING_FORMULA_DYNAMIC);
feeConfigDto.setCommunityId(communityId);
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
@@ -326,13 +330,19 @@
String userId = reqJson.getString("userId");
String feeName = reqJson.getString("feeName");
String batchId = reqJson.getString("batchId");
+ JSONArray importCarFees = reqJson.getJSONArray("importCarFees");
+ List<ImportRoomFee> tmpImportCarFees = importCarFees.toJavaList(ImportRoomFee.class);
if (StringUtil.isEmpty(feeName)) {
feeName = IMPORT_FEE_NAME;
}
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setFeeTypeCd(feeTypeCd);
- feeConfigDto.setFeeNameEq(feeName);
+ if (!StringUtil.isEmpty(tmpImportCarFees.get(0).getConfigId())) {
+ feeConfigDto.setConfigId(tmpImportCarFees.get(0).getConfigId());
+ } else {
+ feeConfigDto.setFeeNameEq(feeName);
+ }
feeConfigDto.setComputingFormula(FeeConfigDto.COMPUTING_FORMULA_DYNAMIC);
feeConfigDto.setCommunityId(communityId);
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
@@ -346,9 +356,7 @@
}
- JSONArray importCarFees = reqJson.getJSONArray("importCarFees");
- List<ImportRoomFee> tmpImportCarFees = importCarFees.toJavaList(ImportRoomFee.class);
for (ImportRoomFee tmpImportCarFee : tmpImportCarFees) {
tmpImportCarFee.setCommunityId(communityId);
@@ -506,12 +514,21 @@
String feeName = reqJson.getString("feeName");
String batchId = reqJson.getString("batchId");
+ JSONArray importCarFees = reqJson.getJSONArray("importRoomFees");
+
+ List<ImportRoomFee> tmpImportContractFees = importCarFees.toJavaList(ImportRoomFee.class);
+
if (StringUtil.isEmpty(feeName)) {
feeName = IMPORT_FEE_NAME;
}
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setFeeTypeCd(feeTypeCd);
- feeConfigDto.setFeeNameEq(feeName);
+ //feeConfigDto.setFeeNameEq(feeName);
+ if (!StringUtil.isEmpty(tmpImportContractFees.get(0).getConfigId())) {
+ feeConfigDto.setConfigId(tmpImportContractFees.get(0).getConfigId());
+ } else {
+ feeConfigDto.setFeeNameEq(feeName);
+ }
feeConfigDto.setComputingFormula(FeeConfigDto.COMPUTING_FORMULA_DYNAMIC);
feeConfigDto.setCommunityId(communityId);
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
@@ -524,10 +541,6 @@
feeConfigDto.setConfigId(feeConfigDtos.get(0).getConfigId());
}
-
- JSONArray importCarFees = reqJson.getJSONArray("importRoomFees");
-
- List<ImportRoomFee> tmpImportContractFees = importCarFees.toJavaList(ImportRoomFee.class);
for (ImportRoomFee tmpImportCarFee : tmpImportContractFees) {
tmpImportCarFee.setCommunityId(communityId);
--
Gitblit v1.8.0