游湖阿底阿妈

java110

2021-05-05 2d079ac843ebcb335f2ef7d6952f9700a16fddde

 service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java

old mode 100644
new mode 100755
@@ -185,16 +185,6 @@
        List<RoomDto> tmpRoomDtos = 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()));
//        }

        tempRooms.addAll(doGetTmpRoomDto(roomDtos, feeDto, threadNum));
        for(RoomDto tmpRoomDto:tempRooms){
@@ -589,7 +579,9 @@
            return targetEndDateAndOweMonth;
        }
        if (FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())) {
            if (!StringUtil.isEmpty(feeDto.getCurDegrees())) {
            if(feeDto.getDeadlineTime() != null){
                targetEndDate = feeDto.getDeadlineTime();
            }else if(!StringUtil.isEmpty(feeDto.getCurDegrees())) {
                targetEndDate = feeDto.getCurReadingTime();
            } else if (feeDto.getImportFeeEndTime() == null) {
                targetEndDate = feeDto.getConfigEndTime();