From 6eb064b4aa583bc8be55b23a82badc5d8442cbb1 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期三, 25 五月 2022 15:27:38 +0800
Subject: [PATCH] 1、优化访客预约等相关设置2、增加积分抵扣
---
service-api/src/main/java/com/java110/api/listener/room/QueryRoomsWithSellListener.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/room/QueryRoomsWithSellListener.java b/service-api/src/main/java/com/java110/api/listener/room/QueryRoomsWithSellListener.java
index cc878b7..a8dbf3a 100755
--- a/service-api/src/main/java/com/java110/api/listener/room/QueryRoomsWithSellListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/room/QueryRoomsWithSellListener.java
@@ -21,6 +21,7 @@
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -68,7 +69,13 @@
apiRoomVo.setTotal(total);
if (total > 0) {
List<RoomDto> roomDtoList = roomInnerServiceSMOImpl.queryRoomsWithSell(roomDto);
- apiRoomVo.setRooms(BeanConvertUtil.covertBeanList(roomDtoList, ApiRoomDataVo.class));
+ List<RoomDto> rooms = new ArrayList<>();
+ for (RoomDto room : roomDtoList) {
+ room.setFloorId(reqJson.getString("floorId"));
+ room.setFloorNum(reqJson.getString("floorNum"));
+ rooms.add(room);
+ }
+ apiRoomVo.setRooms(BeanConvertUtil.covertBeanList(rooms, ApiRoomDataVo.class));
}
int row = reqJson.getInteger("row");
apiRoomVo.setRecords((int) Math.ceil((double) total / (double) row));
@@ -91,13 +98,13 @@
try {
//if (!reqJson.containsKey("floorNum") || StringUtils.isEmpty(reqJson.getString("floorNum"))) {
- List<FloorDto> floorDtos = floorInnerServiceSMOImpl.queryFloors(floorDto);
+ List<FloorDto> floorDtos = floorInnerServiceSMOImpl.queryFloors(floorDto);
- if (floorDtos.size() == 0) {
- return;
- }
+ if (floorDtos.size() == 0) {
+ return;
+ }
- floorId = floorDtos.get(0).getFloorId();
+ floorId = floorDtos.get(0).getFloorId();
//}
} finally {
reqJson.put("floorId", floorId);
--
Gitblit v1.8.0