From 7e3568e7838900af7041d21b643045d54c135eea Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 14 一月 2021 18:59:18 +0800
Subject: [PATCH] 优化代码

---
 java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java |   31 ++++++++++++++-----------------
 1 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java b/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
index 10105cc..b8833bb 100644
--- a/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
+++ b/java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java
@@ -156,17 +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 = feeDto.getCacheRooms();
-        if(roomDtos == null || roomDtos.size() < 1) {
-            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);
@@ -293,9 +293,9 @@
                 return objName;
             }
             roomDto = roomDtos.get(0);
-            if(RoomDto.ROOM_TYPE_ROOM.equals(roomDto.getRoomType())) {
+            if (RoomDto.ROOM_TYPE_ROOM.equals(roomDto.getRoomType())) {
                 objName = roomDto.getFloorNum() + "鏍�" + roomDto.getUnitNum() + "鍗曞厓" + roomDto.getRoomNum() + "瀹�";
-            }else{
+            } else {
                 objName = roomDto.getFloorNum() + "鏍�" + roomDto.getRoomNum() + "瀹�";
             }
         } else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {//杞︿綅鐩稿叧
@@ -591,10 +591,7 @@
             RoomDto roomDto = new RoomDto();
             roomDto.setRoomId(feeDto.getPayerObjId());
             roomDto.setCommunityId(feeDto.getCommunityId());
-            List<RoomDto> roomDtos = feeDto.getCacheRooms();
-            if(roomDtos == null || roomDtos.size() < 1) {
-                roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
-            }
+            List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
             if (roomDtos == null || roomDtos.size() != 1) {
                 throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏈煡鍒版埧灞嬩俊鎭紝鏌ヨ澶氭潯鏁版嵁");
             }

--
Gitblit v1.8.0