From 1e0e62187e2b7ff3e1fef23b182a710dc8cd76f8 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期三, 25 三月 2026 18:22:39 +0800
Subject: [PATCH] 采购导入需求
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportCustomCreateFeeSMOImpl.java | 53 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 17 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 ff8b3fc..e21145c 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
@@ -13,10 +13,10 @@
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerDto;
-import com.java110.dto.payFeeBatch.PayFeeBatchDto;
+import com.java110.dto.payFee.PayFeeBatchDto;
import com.java110.dto.user.UserDto;
-import com.java110.entity.assetImport.ImportCustomCreateFeeDto;
-import com.java110.entity.component.ComponentValidateResult;
+import com.java110.dto.importData.ImportCustomCreateFeeDto;
+import com.java110.dto.system.ComponentValidateResult;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
@@ -27,8 +27,8 @@
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.fee.FeeAttrPo;
import com.java110.po.fee.PayFeePo;
-import com.java110.po.importFeeDetail.ImportFeeDetailPo;
-import com.java110.po.payFeeBatch.PayFeeBatchPo;
+import com.java110.po.importFee.ImportFeeDetailPo;
+import com.java110.po.payFee.PayFeeBatchPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.ImportExcelUtils;
@@ -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);
}
@@ -213,7 +213,7 @@
if (!ImportCustomCreateFeeDto.TYPE_ROOM.equals(importCustomCreateFeeDto.getObjType())) {
continue;
}
- objNames = importCustomCreateFeeDto.getObjName().split("-");
+ objNames = importCustomCreateFeeDto.getObjName().split("-",3);
if (objNames.length != 3) {
continue;
}
@@ -237,7 +237,13 @@
ownerDto.setRoomIds(roomIds.toArray(new String[roomIds.size()]));
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnersByRoom(ownerDto);
for (ImportCustomCreateFeeDto importRoomFee : importCustomCreateFeeDtos) {
+ if(StringUtil.isEmpty(importRoomFee.getPayObjId())){
+ continue;
+ }
for (OwnerDto tmpOwnerDto : ownerDtos) {
+ if(StringUtil.isEmpty(tmpOwnerDto.getRoomId())){
+ continue;
+ }
if (importRoomFee.getPayObjId().equals(tmpOwnerDto.getRoomId())) {
importRoomFee.setOwnerId(tmpOwnerDto.getOwnerId());
importRoomFee.setOwnerName(tmpOwnerDto.getName());
@@ -268,17 +274,23 @@
}
successCount++;
payFeePo = new PayFeePo();
- payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
+ payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId,true));
payFeePo.setEndTime(importRoomFee.getStartTime());
payFeePo.setState(FeeDto.STATE_DOING);
payFeePo.setCommunityId(importRoomFee.getCommunityId());
payFeePo.setConfigId(importRoomFee.getConfigId());
payFeePo.setPayerObjId(importRoomFee.getPayObjId());
- payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
+ if("3003".equals(importRoomFee.getObjType())) {
+ payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CONTRACT);
+ }else if("2002".equals(importRoomFee.getObjType())) {
+ payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
+ }else{
+ payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
+ }
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());
@@ -288,17 +300,24 @@
FeeAttrPo feeAttrPo = new FeeAttrPo();
feeAttrPo.setCommunityId(importRoomFee.getCommunityId());
- feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId,true));
feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_IMPORT_FEE_NAME);
feeAttrPo.setValue(feeConfigDtos.get(0).getFeeName());
feeAttrPo.setFeeId(payFeePo.getFeeId());
feeAttrPos.add(feeAttrPo);
+ feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(importRoomFee.getCommunityId());
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId,true));
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME);
+ feeAttrPo.setValue(importRoomFee.getObjName());
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPos.add(feeAttrPo);
if (!StringUtil.isEmpty(importRoomFee.getOwnerId())) {
feeAttrPo = new FeeAttrPo();
feeAttrPo.setCommunityId(importRoomFee.getCommunityId());
- feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId,true));
feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_ID);
feeAttrPo.setValue(importRoomFee.getOwnerId());
feeAttrPo.setFeeId(payFeePo.getFeeId());
@@ -306,7 +325,7 @@
feeAttrPo = new FeeAttrPo();
feeAttrPo.setCommunityId(importRoomFee.getCommunityId());
- feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId,true));
feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_NAME);
feeAttrPo.setValue(importRoomFee.getOwnerName());
feeAttrPo.setFeeId(payFeePo.getFeeId());
@@ -314,7 +333,7 @@
feeAttrPo = new FeeAttrPo();
feeAttrPo.setCommunityId(importRoomFee.getCommunityId());
- feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId,true));
feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_LINK);
feeAttrPo.setValue(importRoomFee.getOwnerLink());
feeAttrPo.setFeeId(payFeePo.getFeeId());
--
Gitblit v1.8.0