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 | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 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 e8f2f8c..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
@@ -11,7 +11,6 @@
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.importData.ImportRoomFee;
import com.java110.fee.bmo.IImportRoomFee;
-import com.java110.fee.listener.fee.UpdateFeeInfoListener;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
@@ -46,7 +45,7 @@
@Service
public class ImportRoomFeeImpl implements IImportRoomFee {
- private static Logger logger = LoggerFactory.getLogger(UpdateFeeInfoListener.class);
+ private static Logger logger = LoggerFactory.getLogger(ImportRoomFeeImpl.class);
private static final String IMPORT_FEE_NAME = "瀵煎叆璐圭敤";
@@ -99,7 +98,7 @@
String feeTypeCd = reqJson.getString("feeTypeCd");//璐圭敤澶х被
String storeId = reqJson.getString("storeId");
String userId = reqJson.getString("userId");
- String feeName = reqJson.getString("feeName").trim();
+ String feeName = reqJson.getString("feeName");
String batchId = reqJson.getString("batchId");
@@ -119,9 +118,17 @@
feeName = IMPORT_FEE_NAME;
}
+ 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);
@@ -204,6 +211,7 @@
feeAttrPo.setFeeId(payFeePo.getFeeId());
feeAttrPos.add(feeAttrPo);
+ //todo 鎻掑叆鎴鏃堕棿
feeAttrPo = new FeeAttrPo();
feeAttrPo.setCommunityId(communityId);
feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
@@ -322,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.setFeeName(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);
@@ -342,9 +356,7 @@
}
- JSONArray importCarFees = reqJson.getJSONArray("importCarFees");
- List<ImportRoomFee> tmpImportCarFees = importCarFees.toJavaList(ImportRoomFee.class);
for (ImportRoomFee tmpImportCarFee : tmpImportCarFees) {
tmpImportCarFee.setCommunityId(communityId);
@@ -502,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.setFeeName(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);
@@ -520,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);
@@ -671,7 +688,7 @@
payFeeConfigPo.setFeeFlag("2006012");
payFeeConfigPo.setIsDefault("F");
payFeeConfigPo.setPaymentCd("2100");
- payFeeConfigPo.setFeeName(feeConfigDto.getFeeName());
+ payFeeConfigPo.setFeeName(feeConfigDto.getFeeNameEq());
payFeeConfigPo.setSquarePrice("0");
payFeeConfigPo.setPaymentCycle("1");
payFeeConfigPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
--
Gitblit v1.8.0