From 4fafe2304ab5e3df321808f5120b29baf27c7eab Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期一, 25 八月 2025 16:09:52 +0800
Subject: [PATCH] 暂存0822
---
service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java | 55 ++++++++++++++++++++++---------------------------------
1 files changed, 22 insertions(+), 33 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java b/service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java
index 5de248d..9465e7e 100644
--- a/service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java
+++ b/service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java
@@ -107,9 +107,6 @@
String communityId = assetImportLogDetailDto.getCommunityId();
JSONObject data = JSONObject.parseObject(assetImportLogDetailDto.getContent());
ImportRoomFee importRoomFee = BeanConvertUtil.covertBean(data, ImportRoomFee.class);
- RoomDto roomDto = new RoomDto();
- roomDto.setDoorRoomNum(importRoomFee.getDoorRoomNum());
- roomDto.setCommunityId(communityId);
// List<String> roomTypes = Arrays.asList("浣忓畢鐗╀笟璐�","鍟嗛摵鐗╀笟璐�","缁翠慨鏀跺叆","缁翠慨鍩洪噾鏀跺叆","鐢佃垂鍙婄鐞嗚垂","浠ｆ敹姘磋垂","鍚勭被鎶奸噾","绉熼噾鏀跺叆");
List<String> carTypes = Arrays.asList("涓存椂鍋滆溅璐�", "涓氫富浜ф潈杩囬亾鍋滆溅璐�", "灏忎笟涓讳骇鏉冭溅杈嗙鐞嗚垂","鍦颁笅鍋滆溅璐�","鍦伴潰鍋滆溅璐�");
List<String> contractTypes = Arrays.asList("鍨冨溇娓呰繍璐�","鍏朵粬鏀跺叆","琛ヨ创璐圭敤","鍦哄湴浣跨敤璐�","鐢垫骞垮憡锛堜笟濮斾細锛�","蹇�掓煖","鐢垫骞垮憡锛堣仈璁級","鎴夸骇涓粙","闈炴満鍔ㄨ溅绠＄悊璐�","鍏朵粬骞垮憡");
@@ -163,22 +160,9 @@
updateImportLogDetailState(importRoomFee.getDetailId());
}
else if(contractTypes.contains(importRoomFee.getSecondaryFeeTypeCd())){
- List<RoomDto> roomDtos = iRoomInnerServiceSMOImpl.queryRooms(roomDto);
- try {
- importRoomFee.setRoomId(roomDtos.get(0).getRoomId());
- }catch (Exception e){
- throw new IllegalArgumentException("闂ㄥ鍙�"+importRoomFee.getDoorRoomNum()+"鏈煡璇㈠埌鎴垮眿");
- }
importRoomFee.setFeeName(data.getString("secondaryFeeTypeCd"));
- FeeDto feeDto = new FeeDto();
- feeDto.setFeeName(importRoomFee.getFeeName());
- List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
- if(feeDtos.size() == 0){
- updateImportLogDetailState(importRoomFee.getDetailId(),new IllegalArgumentException("璐圭敤椤�"+importRoomFee.getFeeName()+"涓嶅瓨鍦�"));
- throw new IllegalArgumentException("璐圭敤椤�"+importRoomFee.getFeeName()+"涓嶅瓨鍦�");
- }
-
+ importRoomFee.setCommunityId(communityId);
importRoomFee.setDetailId(assetImportLogDetailDto.getDetailId());
importRoomFee.setStartTime(data.getString("chargeStart"));
importRoomFee.setEndTime(data.getString("chargeEnd").split(" ")[0]+" 23:59:59");
@@ -196,13 +180,7 @@
importCarFees.add(importRoomFee);
}
else if(carTypes.contains(JSONObject.parseObject(infos.get(0).getContent()).get("category22"))){
- List<RoomDto> roomDtos = iRoomInnerServiceSMOImpl.queryRooms(roomDto);
- try {
- importRoomFee.setRoomId(roomDtos.get(0).getRoomId());
- }catch (Exception e){
- updateImportLogDetailState(importRoomFee.getDetailId(),new IllegalArgumentException("璐圭敤椤�"+importRoomFee.getFeeName()+"涓嶅瓨鍦�"));
- throw new IllegalArgumentException("闂ㄥ鍙�"+importRoomFee.getDoorRoomNum()+"鏈煡璇㈠埌鎴垮眿");
- }
+ importRoomFee.setCommunityId(communityId);
importRoomFee.setFeeName(data.getString("secondaryFeeTypeCd"));
importRoomFee.setDetailId(assetImportLogDetailDto.getDetailId());
importRoomFee.setStartTime(data.getString("chargeStart"));
@@ -221,13 +199,7 @@
importCarFees.add(importRoomFee);
}
else{
- List<RoomDto> roomDtos = iRoomInnerServiceSMOImpl.queryRooms(roomDto);
- try {
- importRoomFee.setRoomId(roomDtos.get(0).getRoomId());
- }catch (Exception e){
- updateImportLogDetailState(importRoomFee.getDetailId(),new IllegalArgumentException("璐圭敤椤�"+importRoomFee.getFeeName()+"涓嶅瓨鍦�"));
- throw new IllegalArgumentException("闂ㄥ鍙�"+importRoomFee.getDoorRoomNum()+"鏈煡璇㈠埌鎴垮眿");
- }
+ importRoomFee.setCommunityId(communityId);
importRoomFee.setFeeName(data.getString("secondaryFeeTypeCd"));
importRoomFee.setDetailId(assetImportLogDetailDto.getDetailId());
importRoomFee.setStartTime(data.getString("chargeStart"));
@@ -296,13 +268,30 @@
*/
private void importFeeDetail(ImportRoomFee importRoomFee, String storeId, String userId, String batchId) {
+ RoomDto roomDto = new RoomDto();
+ roomDto.setDoorRoomNum(importRoomFee.getDoorRoomNum());
+ roomDto.setCommunityId(importRoomFee.getCommunityId());
+ List<RoomDto> roomDtos = iRoomInnerServiceSMOImpl.queryRooms(roomDto);
+ try {
+ importRoomFee.setRoomId(roomDtos.get(0).getRoomId());
+ }catch (Exception e){
+ throw new IllegalArgumentException("闂ㄥ鍙�"+importRoomFee.getDoorRoomNum()+"鏈煡璇㈠埌鎴垮眿");
+ }
+ FeeDto feeDto2 = new FeeDto();
+ feeDto2.setFeeName(importRoomFee.getFeeName());
+ List<FeeDto> feeDtos2 = feeInnerServiceSMOImpl.queryFees(feeDto2);
+ if(feeDtos2.size() == 0){
+ updateImportLogDetailState(importRoomFee.getDetailId(),new IllegalArgumentException("璐圭敤椤�"+importRoomFee.getFeeName()+"涓嶅瓨鍦�"));
+
+ throw new IllegalArgumentException("璐圭敤椤�"+importRoomFee.getFeeName()+"涓嶅瓨鍦�");
+ }
FeeConfigDto feeConfigDto = new FeeConfigDto();
- feeConfigDto.setFeeNameEq(importRoomFee.getFeeName().trim());
+ feeConfigDto.setFeeName(importRoomFee.getFeeName().trim());
feeConfigDto.setCommunityId(importRoomFee.getCommunityId());
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
if (ListUtil.isNull(feeConfigDtos)) {
- throw new IllegalArgumentException("鏀惰垂椤逛笉瀛樺湪");
+ throw new IllegalArgumentException("鏀惰垂椤�"+feeConfigDto.getFeeName()+"涓嶅瓨鍦�");
}
FeeConfigDto tmpFeeConfigDto = feeConfigDtos.get(0);
--
Gitblit v1.8.0