From 6543cd42661e2f55b28bdc354022a57885d549de Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 04 三月 2021 09:19:49 +0800
Subject: [PATCH] 优化公摊问题
---
service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java
index a583271..b99f8ac 100644
--- a/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java
@@ -183,20 +183,16 @@
}
//鏌ヨ璐圭敤淇℃伅arrearsEndTime
List<RoomDto> tmpRoomDtos = new ArrayList<>();
- //List<RoomDto> tempRooms = new ArrayList<>();
+ List<RoomDto> tempRooms = new ArrayList<>();
int threadNum = Java110ThreadPoolFactory.JAVA110_DEFAULT_THREAD_NUM;
- //for (int roomIndex = 0; roomIndex < roomDtos.size(); roomIndex++) {
- // tempRooms.add(roomDtos.get(roomIndex));
- //if (roomIndex % threadNum == 0 && roomIndex != 0) {
- // tmpRoomDtos.addAll(doGetTmpRoomDto(tempRooms, feeDto, threadNum));
- // tempRooms = new ArrayList();
- // }
- // }
-// if (tempRooms.size() > 0) {
-// tmpRoomDtos.addAll(doGetTmpRoomDto(tempRooms, feeDto, tempRooms.size()));
-// }
- tmpRoomDtos.addAll(doGetTmpRoomDto(roomDtos, feeDto, threadNum));
+ tempRooms.addAll(doGetTmpRoomDto(roomDtos, feeDto, threadNum));
+ for(RoomDto tmpRoomDto:tempRooms){
+ if(tmpRoomDto == null){
+ continue;
+ }
+ tmpRoomDtos.add(tmpRoomDto);
+ }
return ResultVo.createResponseEntity(tmpRoomDtos);
}
@@ -225,7 +221,7 @@
tmpFeeDto.setState(FeeDto.STATE_DOING);
tmpFeeDto.setPayerObjId(tmpRoomDto.getRoomId());
tmpFeeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
- List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+ List<FeeDto> feeDtos = feeInnerServiceSMOImpl.querySimpleFees(tmpFeeDto);
if (feeDtos == null || feeDtos.size() < 1) {
return null;
--
Gitblit v1.8.0