From 586c32160a069a330cd9610d1542e9c047ab99fd Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 17 四月 2023 22:59:59 +0800
Subject: [PATCH] 优化 年龄和身份证号优化为非必填项
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportCustomCreateFeeSMOImpl.java | 16 +++++++++++-----
1 files changed, 11 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 d762bbf..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);
}
@@ -183,6 +183,8 @@
if (!ImportCustomCreateFeeDto.TYPE_CAR.equals(importCustomCreateFeeDto.getObjType())) {
continue;
}
+ importCustomCreateFeeDto.setCarNum(importCustomCreateFeeDto.getObjName());
+
cars.add(importCustomCreateFeeDto);
}
@@ -276,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());
@@ -320,6 +322,10 @@
}
}
+ if (payFeePos.size() < 1) {
+ return;
+ }
+
feeInnerServiceSMOImpl.saveFee(payFeePos);
feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrPos);
--
Gitblit v1.8.0