优化代码

java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java

@@ -116,9 +116,7 @@ public class FeeDto extends PageDto implements Serializable {
 
     private List<FeeAttrDto> feeAttrDtos;
 
-    private List<RoomDto> cacheRooms;
 
-    private List<OwnerCarDto> cacheOwnerCars;
 
 
     public String getAmount() {
@@ -555,19 +553,5 @@ public class FeeDto extends PageDto implements Serializable {
         this.ownerId = ownerId;
     }
 
-    public List<RoomDto> getCacheRooms() {
-        return cacheRooms;
-    }
-
-    public void setCacheRooms(List<RoomDto> cacheRooms) {
-        this.cacheRooms = cacheRooms;
-    }
 
-    public List<OwnerCarDto> getCacheOwnerCars() {
-        return cacheOwnerCars;
-    }
-
-    public void setCacheOwnerCars(List<OwnerCarDto> cacheOwnerCars) {
-        this.cacheOwnerCars = cacheOwnerCars;
-    }
 }

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

@@ -156,17 +156,17 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
         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 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
                 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 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
             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, "未查到房屋信息，查询多条数据");
             }

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

@@ -193,9 +193,7 @@ public class QueryOweFeeImpl implements IQueryOweFee {
 
             List<FeeDto> tmpFeeDtos = new ArrayList<>();
             for (FeeDto tempFeeDto : feeDtos) {
-                List<RoomDto> tmpCacheRoomDtos = new ArrayList<>();
-                tmpCacheRoomDtos.add(tmpRoomDto);
-                tempFeeDto.setCacheRooms(tmpCacheRoomDtos);
+
                 computeFeeSMOImpl.computeEveryOweFee(tempFeeDto);//计算欠费金额
                 //如果金额为0 就排除
                 if (tempFeeDto.getFeePrice() > 0 && tempFeeDto.getEndTime().getTime() <= DateUtil.getCurrentDate().getTime()) {

service-order/src/main/java/com/java110/order/dao/impl/PrivilegeDAOImpl.java

@@ -45,9 +45,9 @@ public class PrivilegeDAOImpl extends BaseServiceDao implements IPrivilegeDAO {
     public boolean deleteUserAllPrivilege(Map info) {
         logger.debug("用户默认权限保存入参：{}", info);
         int saveFlag = sqlSessionTemplate.insert("privilegeDAOImpl.deleteUserAllPrivilege", info);
-        if (saveFlag < 1) {
-            throw new DAOException(ResponseConstant.RESULT_CODE_INNER_ERROR, "删除权限信息失败：" + JSONObject.toJSONString(info));
-        }
+//        if (saveFlag < 1) {
+//            throw new DAOException(ResponseConstant.RESULT_CODE_INNER_ERROR, "删除权限信息失败：" + JSONObject.toJSONString(info));
+//        }
         return true;
     }