From bf3924206b359d77e928255328f8625cb986bd72 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期一, 25 八月 2025 20:46:02 +0800
Subject: [PATCH] 修复费用初始化0825
---
service-job/src/main/java/com/java110/job/importData/adapt/ImportCarHistoryFeeDetailQueueDataAdapt.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/importData/adapt/ImportCarHistoryFeeDetailQueueDataAdapt.java b/service-job/src/main/java/com/java110/job/importData/adapt/ImportCarHistoryFeeDetailQueueDataAdapt.java
index a2ca9c77..7c3d7f3 100644
--- a/service-job/src/main/java/com/java110/job/importData/adapt/ImportCarHistoryFeeDetailQueueDataAdapt.java
+++ b/service-job/src/main/java/com/java110/job/importData/adapt/ImportCarHistoryFeeDetailQueueDataAdapt.java
@@ -103,7 +103,7 @@
importCarFees = ownerCarInnerServiceSMOImpl.freshCarIds(importCarFees);
for (ImportRoomFee importCarFee : importCarFees) {
try {
- if (StringUtil.isEmpty(importCarFee.getCarId())) {
+ if (StringUtil.isEmpty(importCarFee.getCarNum())) {
continue;
}
importCarFeeDetail(importCarFee, storeId, userId, batchId);
@@ -123,14 +123,26 @@
private void importCarFeeDetail(ImportRoomFee importRoomFee, String storeId, String userId, String batchId) {
RoomDto roomDto = new RoomDto();
- roomDto.setDoorRoomNum(importRoomFee.getDoorRoomNum());
+// roomDto.setDoorRoomNum(importRoomFee.getDoorRoomNum());
roomDto.setCommunityId(importRoomFee.getCommunityId());
+ if(importRoomFee.getDoorRoomNum()!=null){
+ String[] split = importRoomFee.getDoorRoomNum().split("-");
+ if(split.length==2){
+ roomDto.setDoorRoomNum(importRoomFee.getDoorRoomNum());
+ }else if(split.length > 2){
+ roomDto.setFloorNum(split[0]);
+ roomDto.setUnitNum(split[1]);
+ roomDto.setRoomNum(split[2]);
+ }
+ }
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()+"鏈煡璇㈠埌鎴垮眿");
+ if(!(importRoomFee.getPayObjId().equals("7777"))){
+ updateImportLogDetailState(importRoomFee.getDetailId(),new IllegalArgumentException("璐圭敤椤�"+importRoomFee.getFeeName()+"涓嶅瓨鍦�"));
+ throw new IllegalArgumentException("闂ㄥ鍙�"+importRoomFee.getDoorRoomNum()+"鏈煡璇㈠埌鎴垮眿");
+ }
}
PayFeeDetailPo payFeeDetailPo = new PayFeeDetailPo();
payFeeDetailPo.setPayOrderId(importRoomFee.getRoomId());
--
Gitblit v1.8.0