From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 accc6f9..60abdd3 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
@@ -32,7 +32,7 @@
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
@@ -122,6 +122,7 @@
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setFeeTypeCd(feeTypeCd);
feeConfigDto.setFeeName(feeName);
+ feeConfigDto.setComputingFormula(FeeConfigDto.COMPUTING_FORMULA_DYNAMIC);
feeConfigDto.setCommunityId(communityId);
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
// 鏍规嵁璐圭敤澶х被 鍒ゆ柇鏄惁鏈夊瓨鍦� 璐圭敤瀵煎叆鏀跺叆椤�
@@ -150,6 +151,9 @@
ownerDto.setRoomIds(roomIds.toArray(new String[roomIds.size()]));
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnersByRoom(ownerDto);
for (ImportRoomFee importRoomFee : tmpImportRoomFees) {
+ if(StringUtil.isEmpty(importRoomFee.getRoomId())){
+ throw new IllegalArgumentException("鎴垮眿涓嶅瓨鍦紝"+importRoomFee.getFloorNum()+"-"+importRoomFee.getUnitNum()+"-"+importRoomFee.getRoomNum());
+ }
for (OwnerDto tmpOwnerDto : ownerDtos) {
if (importRoomFee.getRoomId().equals(tmpOwnerDto.getRoomId())) {
importRoomFee.setOwnerId(tmpOwnerDto.getOwnerId());
@@ -316,6 +320,7 @@
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setFeeTypeCd(feeTypeCd);
feeConfigDto.setFeeName(feeName);
+ feeConfigDto.setComputingFormula(FeeConfigDto.COMPUTING_FORMULA_DYNAMIC);
feeConfigDto.setCommunityId(communityId);
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
// 鏍规嵁璐圭敤澶х被 鍒ゆ柇鏄惁鏈夊瓨鍦� 璐圭敤瀵煎叆鏀跺叆椤�
@@ -494,6 +499,7 @@
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setFeeTypeCd(feeTypeCd);
feeConfigDto.setFeeName(feeName);
+ feeConfigDto.setComputingFormula(FeeConfigDto.COMPUTING_FORMULA_DYNAMIC);
feeConfigDto.setCommunityId(communityId);
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
// 鏍规嵁璐圭敤澶х被 鍒ゆ柇鏄惁鏈夊瓨鍦� 璐圭敤瀵煎叆鏀跺叆椤�
@@ -651,7 +657,7 @@
PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(feeConfigDto, PayFeeConfigPo.class);
payFeeConfigPo.setAdditionalAmount("0");
payFeeConfigPo.setBillType(FeeConfigDto.BILL_TYPE_MONTH);
- payFeeConfigPo.setComputingFormula("4004");
+ payFeeConfigPo.setComputingFormula(FeeConfigDto.COMPUTING_FORMULA_DYNAMIC);
payFeeConfigPo.setEndTime(DateUtil.getLastTime());
payFeeConfigPo.setFeeFlag("2006012");
payFeeConfigPo.setIsDefault("F");
@@ -660,6 +666,11 @@
payFeeConfigPo.setSquarePrice("0");
payFeeConfigPo.setPaymentCycle("1");
payFeeConfigPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ payFeeConfigPo.setDeductFrom(FeeConfigDto.DEDUCT_FROM_N);
+ payFeeConfigPo.setDecimalPlace("2");
+ payFeeConfigPo.setScale("1");
+ payFeeConfigPo.setUnits("鍏�");
+ payFeeConfigPo.setPayOnline("Y");
int saveFlag = feeConfigInnerServiceSMOImpl.saveFeeConfig(payFeeConfigPo);
if (saveFlag < 1) {
--
Gitblit v1.8.0