Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/DTO/CesRoomLayoutRemoveDto.java

@@ -7,4 +7,5 @@ import java.util.List;
 @Data
 public class CesRoomLayoutRemoveDto {
     private List<String> roomLayoutIds;
+    private String id;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/DTO/CesRoomLayoutSearchDto.java

@@ -28,4 +28,9 @@ public class CesRoomLayoutSearchDto  extends BasePage {
      */
     private Integer appState;
 
+    /**
+     * 酒店id
+     */
+    private String hotelId;
+
 }

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

@@ -26,6 +26,7 @@ import org.springframework.stereotype.Controller;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -138,9 +139,15 @@ public class CesRoomLayoutController extends JeecgController<CesRoomLayout, CesR
     @AutoLog(value = "删除房型房型")
     @ApiOperation(value="删除房型房型", notes="删除房型")
     @DeleteMapping(value = "/remove")
-    public Result removeRoomLayout(@RequestBody CesRoomLayoutRemoveDto dto){
+    public Result removeRoomLayout(CesRoomLayoutRemoveDto dto){
         if(CollectionUtil.isEmpty(dto.getRoomLayoutIds())){
-            return Result.error(ResultCode.PARAM_MISS);
+            if(dto.getId() != null) {
+                List<String> ids = new ArrayList<>();
+                ids.add(dto.getId());
+                dto.setRoomLayoutIds(ids);
+            } else {
+                return Result.error(ResultCode.PARAM_MISS);
+            }
         }
         try{
             return  cesRoomLayoutService.removeRoomLayout(dto);

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

@@ -52,7 +52,7 @@ public class CesRoomLayoutPriceServiceImpl extends ServiceImpl<CesRoomLayoutPric
         QueryWrapper<CesRoomLayoutPrice> queryWrapper =new QueryWrapper<>();
         queryWrapper.eq(CesRoomLayoutPrice.HOTELID,searchDto.getHotelId());
         queryWrapper.eq(CesRoomLayoutPrice.LAYOUTID,searchDto.getRoomLayoutId());
-        queryWrapper.eq(CesRoomLayoutPrice.TYPE,searchDto.getType().intValue());
+        if(searchDto.getType() != null && searchDto.getType() > 0) queryWrapper.eq(CesRoomLayoutPrice.TYPE,searchDto.getType().intValue());
         queryWrapper.eq(CesRoomLayoutPrice.INVALID,false);
 
         queryWrapper.orderByDesc(CesRoomLayoutPrice.CREATEAT);

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

@@ -62,6 +62,9 @@ public class CesRoomLayoutServiceImpl extends ServiceImpl<CesRoomLayoutMapper, C
                 queryWrapper.in(CesRoomLayout.HOTEL_ID, busHotelIds);
             }
         }
+        if(!StringUtils.isBlank(searchDto.getHotelId())) {
+            queryWrapper.eq(CesRoomLayout.HOTEL_ID, searchDto.getHotelId());
+        }
         //房型名称模糊查询
         if(!StringUtils.isBlank(searchDto.getName())){
             //处理百分号 mybatis plus bug 查询 % 出现全量数据