diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbCallTableController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbCallTableController.java index 73c86b4..14b1039 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbCallTableController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbCallTableController.java @@ -31,7 +31,7 @@ public class TbCallTableController { * @param shopId 店铺id * @return data */ - @GetMapping + @GetMapping("queue") public Result get( @RequestParam String openId, @RequestParam Integer shopId @@ -39,4 +39,11 @@ public class TbCallTableController { return Result.successWithData(tbCallService.getList(shopId, openId)); } + @GetMapping + public Result getList( + @RequestParam Integer shopId + ) { + return Result.successWithData(tbCallService.getAllInfo(shopId)); + } + } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbCallService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbCallService.java index 655f0e2..3a2dd59 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbCallService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbCallService.java @@ -6,4 +6,6 @@ public interface TbCallService { Object takeNumber(TakeNumberDTO takeNumberDTO); Object getList(Integer shopId, String openId); + + Object getAllInfo(Integer shopId); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java index f0a260f..43db758 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java @@ -95,4 +95,9 @@ public class TbCallServiceImpl implements TbCallService { public Object getList(Integer shopId, String openId) { return callQueueMapper.selectInfoByOpenId(shopId, openId); } + + @Override + public Object getAllInfo(Integer shopId) { + return callTableService.lambdaQuery().eq(TbCallTable::getShopId, shopId).eq(TbCallTable::getState, 1).list(); + } }