优化代码

java110

2021-01-14 7e3568e7838900af7041d21b643045d54c135eea

 java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java

@@ -140,9 +140,9 @@
        feeDto.setDeadlineTime(targetEndDate);

        //动态费用
        if ("4004".equals(computingFormula)) {
        if ("4004".equals(computingFormula) && !FeeDto.STATE_FINISH.equals(feeDto.getState())) {
            feeDto.setAmountOwed(feeDto.getFeePrice() + "");
            feeDto.setDeadlineTime(DateUtil.getCurrentDate());
            //feeDto.setDeadlineTime(DateUtil.getCurrentDate()); 欠费日期不对先注释
        }

    }
@@ -156,14 +156,17 @@
        Map<String, Object> targetEndDateAndOweMonth = getTargetEndDateAndOweMonth(feeDto);
        Date targetEndDate = (Date) targetEndDateAndOweMonth.get("targetEndDate");
        double oweMonth = (double) targetEndDateAndOweMonth.get("oweMonth");
        RoomDto roomDto = new RoomDto();
        roomDto.setCommunityId(feeDto.getCommunityId());
        roomDto.setRoomId(feeDto.getPayerObjId());
        List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);

        if (roomDtos == null || roomDtos.size() < 1) { //数据有问题
            return;
        }
//        RoomDto roomDto = new RoomDto();
//        roomDto.setCommunityId(feeDto.getCommunityId());
//        roomDto.setRoomId(feeDto.getPayerObjId());
//        List<RoomDto> roomDtos = feeDto.getCacheRooms();
//        if(roomDtos == null || roomDtos.size() < 1) {
//            roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
//        }
//
//        if (roomDtos == null || roomDtos.size() < 1) { //数据有问题
//            return;
//        }

        String computingFormula = feeDto.getComputingFormula();
        double feePrice = getFeePrice(feeDto);
@@ -175,9 +178,9 @@
        feeDto.setDeadlineTime(targetEndDate);

        //动态费用
        if ("4004".equals(computingFormula)) {
        if ("4004".equals(computingFormula) && !FeeDto.STATE_FINISH.equals(feeDto.getState())) {
            feeDto.setAmountOwed(feeDto.getFeePrice() + "");
            feeDto.setDeadlineTime(DateUtil.getCurrentDate());
            //feeDto.setDeadlineTime(DateUtil.getCurrentDate()); 欠费日期不对先注释
        }
    }

@@ -290,7 +293,11 @@
                return objName;
            }
            roomDto = roomDtos.get(0);
            objName = roomDto.getFloorNum() + "栋" + roomDto.getUnitNum() + "单元" + roomDto.getRoomNum() + "室";
            if (RoomDto.ROOM_TYPE_ROOM.equals(roomDto.getRoomType())) {
                objName = roomDto.getFloorNum() + "栋" + roomDto.getUnitNum() + "单元" + roomDto.getRoomNum() + "室";
            } else {
                objName = roomDto.getFloorNum() + "栋" + roomDto.getRoomNum() + "室";
            }
        } else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {//车位相关

            OwnerCarDto ownerCarDto = new OwnerCarDto();