From b18faca8d7bdcdad734349441b5a1e59fe144560 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 22 九月 2021 19:19:59 +0800
Subject: [PATCH] 优化 非因公加入批次
---
service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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 d0be61c..28d5449 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
@@ -95,6 +95,20 @@
String storeId = reqJson.getString("storeId");
String userId = reqJson.getString("userId");
String feeName = reqJson.getString("feeName");
+ String batchId = reqJson.getString("batchId");
+
+
+ JSONArray importRoomFees = reqJson.getJSONArray("importRoomFees");
+
+ List<ImportRoomFee> tmpImportRoomFees = importRoomFees.toJavaList(ImportRoomFee.class);
+
+ if (tmpImportRoomFees == null || tmpImportRoomFees.size() < 1) {
+ throw new IllegalArgumentException("鏈寘鍚鍏ヨ垂鐢�");
+ }
+
+ if (StringUtil.isEmpty(feeName)) {
+ feeName = tmpImportRoomFees.get(0).getFeeName();
+ }
if (StringUtil.isEmpty(feeName)) {
feeName = IMPORT_FEE_NAME;
@@ -113,11 +127,6 @@
} else {
feeConfigDto.setConfigId(feeConfigDtos.get(0).getConfigId());
}
-
-
- JSONArray importRoomFees = reqJson.getJSONArray("importRoomFees");
-
- List<ImportRoomFee> tmpImportRoomFees = importRoomFees.toJavaList(ImportRoomFee.class);
for (ImportRoomFee tmpImportRoomFee : tmpImportRoomFees) {
tmpImportRoomFee.setCommunityId(communityId);
@@ -172,6 +181,7 @@
payFeePo.setFeeTypeCd(feeTypeCd);
payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
payFeePo.setAmount(importRoomFee.getAmount());
+ payFeePo.setBatchId(batchId);
//payFeePo.setStartTime(importRoomFee.getStartTime());
payFeePo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -293,6 +303,7 @@
String storeId = reqJson.getString("storeId");
String userId = reqJson.getString("userId");
String feeName = reqJson.getString("feeName");
+ String batchId = reqJson.getString("batchId");
if (StringUtil.isEmpty(feeName)) {
feeName = IMPORT_FEE_NAME;
@@ -350,6 +361,7 @@
payFeePo.setFeeTypeCd(feeTypeCd);
payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
payFeePo.setAmount(importCarFee.getAmount());
+ payFeePo.setBatchId(batchId);
//payFeePo.setStartTime(importRoomFee.getStartTime());
payFeePo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -635,9 +647,9 @@
payFeeConfigPo.setComputingFormula("4004");
payFeeConfigPo.setEndTime(DateUtil.getLastTime());
payFeeConfigPo.setFeeFlag("2006012");
- payFeeConfigPo.setIsDefault("T");
+ payFeeConfigPo.setIsDefault("F");
payFeeConfigPo.setPaymentCd("2100");
- payFeeConfigPo.setFeeName(IMPORT_FEE_NAME);
+ payFeeConfigPo.setFeeName(feeConfigDto.getFeeName());
payFeeConfigPo.setSquarePrice("0");
payFeeConfigPo.setPaymentCycle("1");
payFeeConfigPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
--
Gitblit v1.8.0