可用房间数量推送

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesRoomsController.java

@@ -15,6 +15,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.modules.rooms.DTO.*;
 import org.jeecg.modules.rooms.Enum.CouponEnums;
+import org.jeecg.modules.rooms.Vo.CanUseResultVo;
 import org.jeecg.modules.rooms.Vo.FloorBuildingRoomVo;
 import org.jeecg.modules.rooms.Vo.FloorWithBuildingVo;
 import org.jeecg.modules.rooms.entity.CesRoomLayout;
@@ -111,7 +112,7 @@ public class CesRoomsController {
      */
     @ApiOperation(value="可用房间", notes="可用房间")
     @GetMapping(value = "/can-user-rooms")
-    public Result getCanUseRooms(CanUseRequestParamDto param) {
+    public Result<List<CanUseResultVo>> getCanUseRooms(CanUseRequestParamDto param) {
         if(param.getHotelId()==null || param.getHotelId().isEmpty())
             throw new JeecgBootException("参数错误");
         if(param.getEndOf() == null || param.getStartOf() == null)

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/entity/CesRoomLayout.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -179,6 +181,13 @@ public class CesRoomLayout extends Model<CesRoomLayout> {
     @TableField(exist = false)
     private Boolean isSupportHourRule;
 
+    /**
+     * 可用房间数
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "可用房间数")
+    private Integer canUseCount;
+
 
     public static final String ID = "id";
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/service/CesRoomsServiceImpl.java

@@ -306,8 +306,7 @@ public class CesRoomsServiceImpl extends ServiceImpl<CesRoomsMapper, CesRooms> i
                canUseRoomCount[0] += floorRooms.size();
                floorVos.add(floorRoomsVo);
            });
-           // 可用房间数量，暂时就放在这个tags字段
-           s.setTags(canUseRoomCount[0].toString());
+           s.setCanUseCount(canUseRoomCount[0]); //设置可用房间数
            item.setLayout(s);
            item.setBuildingRooms(floorVos);
            results.add(item);