From afe3952e5fbf565cba6a2e4da82eec89f383fd4c Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 22 一月 2024 22:20:17 +0800
Subject: [PATCH] 优化代码
---
service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomFeeQueueDataAdapt.java | 68 ++++++++++++++++++++++++++++++----
1 files changed, 60 insertions(+), 8 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomFeeQueueDataAdapt.java b/service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomFeeQueueDataAdapt.java
index 374fc72..e0fd896 100644
--- a/service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomFeeQueueDataAdapt.java
+++ b/service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomFeeQueueDataAdapt.java
@@ -6,15 +6,13 @@
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.importData.ImportCustomCreateFeeDto;
+import com.java110.dto.importData.ImportFeeDto;
import com.java110.dto.importData.ImportRoomFee;
import com.java110.dto.log.AssetImportLogDetailDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.payFee.PayFeeDetailRefreshFeeMonthDto;
import com.java110.intf.community.IRoomInnerServiceSMO;
-import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
-import com.java110.intf.fee.IFeeInnerServiceSMO;
-import com.java110.intf.fee.IPayFeeConfigV1InnerServiceSMO;
-import com.java110.intf.fee.IPayFeeMonthInnerServiceSMO;
+import com.java110.intf.fee.*;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
@@ -23,6 +21,7 @@
import com.java110.po.fee.FeeAttrPo;
import com.java110.po.fee.PayFeePo;
import com.java110.po.importFee.ImportFeeDetailPo;
+import com.java110.po.importFee.ImportFeePo;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
@@ -59,6 +58,12 @@
@Autowired
private IPayFeeMonthInnerServiceSMO payFeeMonthInnerServiceSMOImpl;
+ @Autowired
+ private IImportFeeDetailInnerServiceSMO importFeeDetailInnerServiceSMOImpl;
+
+ @Autowired
+ private IImportFeeInnerServiceSMO importFeeInnerServiceSMOImpl;
+
// @Autowired
// private IPayFeeMonth payFeeMonthImpl;
@Override
@@ -81,7 +86,7 @@
ImportRoomFee importRoomFee = BeanConvertUtil.covertBean(data, ImportRoomFee.class);
String communityId = importRoomFee.getCommunityId();
- String batchId = importRoomFee.getCommunityId();
+ String batchId = importRoomFee.getBatchId();
doImportRoomCreateFee(importRoomFee, batchId);
doImportCarCreateFee(importRoomFee, batchId);
@@ -96,7 +101,7 @@
* @param batchId
*/
private void doImportRoomCreateFee(ImportRoomFee importRoomFee, String batchId) {
- if (!ImportCustomCreateFeeDto.TYPE_ROOM.equals(importRoomFee.getObjType())) {
+ if (!FeeDto.PAYER_OBJ_TYPE_ROOM.equals(importRoomFee.getObjType())) {
return;
}
List<ImportRoomFee> rooms = new ArrayList<>();
@@ -145,7 +150,7 @@
* @param batchId
*/
private void doImportCarCreateFee(ImportRoomFee importRoomFee, String batchId) {
- if (!ImportCustomCreateFeeDto.TYPE_CAR.equals(importRoomFee.getObjType())) {
+ if (!FeeDto.PAYER_OBJ_TYPE_CAR.equals(importRoomFee.getObjType())) {
return;
}
List<ImportRoomFee> cars = new ArrayList<>();
@@ -204,7 +209,7 @@
payFeePo.setIncomeObjId(importRoomFee.getStoreId());
payFeePo.setFeeTypeCd(feeConfigDtos.get(0).getFeeTypeCd());
payFeePo.setFeeFlag(feeConfigDtos.get(0).getFeeFlag());
- payFeePo.setAmount("-1");
+ payFeePo.setAmount(importRoomFee.getAmount());
payFeePo.setBatchId(batchId);
payFeePo.setEndTime(importRoomFee.getStartTime());
payFeePo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -273,6 +278,9 @@
feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrPos);
+ //todo 淇濆瓨瀵煎叆璁板綍鏃ュ織
+ saveImportFee(importRoomFee, payFeePo);
+
// todo 杩欓噷寮傛鐨勬柟寮忚绠� 鏈堟暟鎹� 鍜屾瑺璐规暟鎹�
PayFeeDetailRefreshFeeMonthDto payFeeDetailRefreshFeeMonthDto = new PayFeeDetailRefreshFeeMonthDto();
@@ -280,4 +288,48 @@
payFeeDetailRefreshFeeMonthDto.setFeeId(payFeePos.get(0).getFeeId());
payFeeMonthInnerServiceSMOImpl.doGeneratorOrRefreshFeeMonth(payFeeDetailRefreshFeeMonthDto);
}
+
+ private void saveImportFee(ImportRoomFee importRoomFee, PayFeePo payFeePo) {
+ ImportFeeDetailPo importFeeDetailPo;
+ List<ImportFeeDetailPo> importFeeDetailPos = new ArrayList<>();
+ importFeeDetailPo = new ImportFeeDetailPo();
+ importFeeDetailPo.setAmount(importRoomFee.getAmount());
+ importFeeDetailPo.setCommunityId(payFeePo.getCommunityId());
+ importFeeDetailPo.setEndTime(importRoomFee.getEndTime());
+ importFeeDetailPo.setFeeId(payFeePo.getFeeId());
+ importFeeDetailPo.setFeeName(importRoomFee.getFeeName());
+ importFeeDetailPo.setFloorNum(importRoomFee.getFloorNum());
+ importFeeDetailPo.setUnitNum(importRoomFee.getUnitNum());
+ importFeeDetailPo.setRoomNum(importRoomFee.getRoomNum());
+ importFeeDetailPo.setRoomId(importRoomFee.getRoomId());
+ importFeeDetailPo.setObjId(importRoomFee.getRoomId());
+ importFeeDetailPo.setObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
+ importFeeDetailPo.setObjName(!"0".equals(importRoomFee.getUnitNum())
+ ? importRoomFee.getFloorNum() + "鏍�" + importRoomFee.getUnitNum() + "鍗曞厓" + importRoomFee.getRoomNum() + "瀹�" :
+ importRoomFee.getFloorNum() + "鏍�" + importRoomFee.getRoomNum() + "瀹�"
+ );
+ importFeeDetailPo.setStartTime(importRoomFee.getStartTime());
+ importFeeDetailPo.setIfdId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_IfdId, true));
+ importFeeDetailPo.setState("1000");
+ importFeeDetailPo.setImportFeeId(importRoomFee.getBatchId());
+ importFeeDetailPos.add(importFeeDetailPo);
+
+ ImportFeeDto importFeeDto = new ImportFeeDto();
+ importFeeDto.setCommunityId(payFeePo.getCommunityId());
+ importFeeDto.setImportFeeId(importRoomFee.getBatchId());
+
+ List<ImportFeeDto> importRoomFeess = importFeeInnerServiceSMOImpl.queryImportFees(importFeeDto);
+
+ if (importRoomFeess == null || importRoomFeess.size() < 1) {
+ //淇濆瓨鏃ュ織
+ ImportFeePo importFeePo = new ImportFeePo();
+ importFeePo.setCommunityId(importRoomFee.getCommunityId());
+ importFeePo.setFeeTypeCd(importRoomFee.getFeeTypeCd());
+ importFeePo.setImportFeeId(importRoomFee.getBatchId());
+ importFeeInnerServiceSMOImpl.saveImportFee(importFeePo);
+ }
+
+
+ importFeeDetailInnerServiceSMOImpl.saveImportFeeDetails(importFeeDetailPos);
+ }
}
--
Gitblit v1.8.0