From 7cd9cc73b6bbae05e8fa734e29f6cd435e2599ba Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 28 六月 2023 14:27: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 | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 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 d691719..27e5b78 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
@@ -7,11 +7,10 @@
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
-import com.java110.dto.importFee.ImportFeeDto;
+import com.java110.dto.importData.ImportFeeDto;
import com.java110.dto.owner.OwnerDto;
-import com.java110.entity.assetImport.ImportRoomFee;
+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;
@@ -25,7 +24,7 @@
import com.java110.po.fee.PayFeeConfigPo;
import com.java110.po.fee.PayFeePo;
import com.java110.po.importFee.ImportFeePo;
-import com.java110.po.importFeeDetail.ImportFeeDetailPo;
+import com.java110.po.importFee.ImportFeeDetailPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
@@ -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");
+ String feeName = reqJson.getString("feeName").trim();
String batchId = reqJson.getString("batchId");
@@ -121,7 +120,7 @@
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setFeeTypeCd(feeTypeCd);
- feeConfigDto.setFeeName(feeName);
+ feeConfigDto.setFeeNameEq(feeName);
feeConfigDto.setComputingFormula(FeeConfigDto.COMPUTING_FORMULA_DYNAMIC);
feeConfigDto.setCommunityId(communityId);
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
@@ -151,8 +150,8 @@
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());
+ if (StringUtil.isEmpty(importRoomFee.getRoomId())) {
+ throw new IllegalArgumentException("鎴垮眿涓嶅瓨鍦紝" + importRoomFee.getFloorNum() + "-" + importRoomFee.getUnitNum() + "-" + importRoomFee.getRoomNum());
}
for (OwnerDto tmpOwnerDto : ownerDtos) {
if (importRoomFee.getRoomId().equals(tmpOwnerDto.getRoomId())) {
@@ -209,6 +208,15 @@
feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME);
feeAttrPo.setValue(importRoomFee.getEndTime());
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPos.add(feeAttrPo);
+
+ //todo 璐圭敤瀵硅薄鍚嶇О
+ feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(communityId);
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME);
+ feeAttrPo.setValue(importRoomFee.getRoomName());
feeAttrPo.setFeeId(payFeePo.getFeeId());
feeAttrPos.add(feeAttrPo);
@@ -319,7 +327,7 @@
}
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setFeeTypeCd(feeTypeCd);
- feeConfigDto.setFeeName(feeName);
+ feeConfigDto.setFeeNameEq(feeName);
feeConfigDto.setComputingFormula(FeeConfigDto.COMPUTING_FORMULA_DYNAMIC);
feeConfigDto.setCommunityId(communityId);
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
@@ -498,7 +506,7 @@
}
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setFeeTypeCd(feeTypeCd);
- feeConfigDto.setFeeName(feeName);
+ feeConfigDto.setFeeNameEq(feeName);
feeConfigDto.setComputingFormula(FeeConfigDto.COMPUTING_FORMULA_DYNAMIC);
feeConfigDto.setCommunityId(communityId);
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
@@ -662,11 +670,15 @@
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));
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