Commit 08c85999 by 吕明尚

修改当前门店可更换房间列表

parent 04d634bc
...@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.*;
import share.common.annotation.Log; import share.common.annotation.Log;
import share.common.core.controller.BaseController; import share.common.core.controller.BaseController;
import share.common.core.domain.AjaxResult; import share.common.core.domain.AjaxResult;
import share.common.core.domain.R;
import share.common.core.page.TableDataInfo; import share.common.core.page.TableDataInfo;
import share.common.enums.BusinessType; import share.common.enums.BusinessType;
import share.common.utils.poi.ExcelUtil; import share.common.utils.poi.ExcelUtil;
...@@ -138,12 +139,12 @@ public class SOrderController extends BaseController ...@@ -138,12 +139,12 @@ public class SOrderController extends BaseController
//查询当前门店可更换房间列表 //查询当前门店可更换房间列表
@GetMapping("/changeRoomList") @GetMapping("/changeRoomList")
public AjaxResult changeRoomList(Long id) { public R changeRoomList(Long id) {
List<SRoomVo> sRoomVos = sOrderService.changeRoomList(id); List<SRoomVo> sRoomVos = sOrderService.changeRoomList(id);
if (CollectionUtils.isNotEmpty(sRoomVos)) { if (CollectionUtils.isNotEmpty(sRoomVos)) {
return success(sRoomVos); return R.ok(sRoomVos);
} else { } else {
return error("当前门店没有空闲房间"); return R.ok(null, "当前门店无可更换房间");
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment