From 0417d31de9980cbc1735daffffb308d050ce35b4 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期六, 18 九月 2021 16:47:52 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev
---
service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 590bb5d..ff12d8c 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
@@ -96,6 +96,19 @@
String userId = reqJson.getString("userId");
String feeName = reqJson.getString("feeName");
+
+ 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 +126,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);
@@ -635,7 +643,7 @@
payFeeConfigPo.setComputingFormula("4004");
payFeeConfigPo.setEndTime(DateUtil.getLastTime());
payFeeConfigPo.setFeeFlag("2006012");
- payFeeConfigPo.setIsDefault("T");
+ payFeeConfigPo.setIsDefault("F");
payFeeConfigPo.setPaymentCd("2100");
payFeeConfigPo.setFeeName(feeConfigDto.getFeeName());
payFeeConfigPo.setSquarePrice("0");
--
Gitblit v1.8.0