diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopTableController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopTableController.java index 5cd321af..7b8230aa 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopTableController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopTableController.java @@ -36,7 +36,7 @@ public class ShopTableController { * 批量生成台桌码 * 权限标识: shopTable:code */ - @SaAdminCheckPermission("shopTable:code") + @SaAdminCheckPermission(value = "shopTable:code", name = "生成台桌码") @PostMapping("/code") public void createCode(@RequestParam Integer num, HttpServletResponse response, HttpServletRequest request) throws IOException { if (num > 100) { @@ -53,10 +53,10 @@ public class ShopTableController { * @param status 台桌状态 * @return 台桌列表 */ - @SaAdminCheckPermission("shopTable:list") + @SaAdminCheckPermission(value = "shopTable:list", name = "获取台桌列表") @GetMapping - public CzgResult> list(Integer areaId, String tableCode, String status, String name) { - return CzgResult.success(shopTableService.pageInfo(StpKit.USER.getShopId(), areaId, tableCode, status, name)); + public CzgResult> list(Integer areaId, String tableCode, String status, String name, Boolean isBind) { + return CzgResult.success(shopTableService.pageInfo(StpKit.USER.getShopId(), areaId, tableCode, status, name, isBind)); } /** @@ -65,7 +65,7 @@ public class ShopTableController { * @param id 台桌id * @return 台桌列表 */ - @SaAdminCheckPermission("shopTable:detail") + @SaAdminCheckPermission(value = "shopTable:detail", name = "获取台桌详情") @GetMapping("/detail") public CzgResult detail(Long id, String tableCode) { if (id == null && StrUtil.isBlank(tableCode)) { @@ -84,7 +84,7 @@ public class ShopTableController { * 权限标识: shopTable:edit * @return 是否成功 */ - @SaAdminCheckPermission("shopTable:edit") + @SaAdminCheckPermission(value = "shopTable:edit", name = "台桌信息修改") @PutMapping public CzgResult edit(@RequestBody @Validated ShopTableDTO shopTableDTO) { return CzgResult.success(shopTableService.updateInfo(StpKit.USER.getLoginIdAsLong(), shopTableDTO)); @@ -95,7 +95,7 @@ public class ShopTableController { * 权限标识: shopTable:clear * @return 是否成功 */ - @SaAdminCheckPermission("shopTable:clear") + @SaAdminCheckPermission(value = "shopTable:clear", name = "台桌清台") @PutMapping("/clear") public CzgResult clear(@RequestBody @Validated ShopTableClearDTO shopTableClearDTO) { return CzgResult.success(shopTableService.clear(StpKit.USER.getLoginIdAsLong(), shopTableClearDTO)); @@ -106,7 +106,7 @@ public class ShopTableController { * 权限标识: shopTable:del * @return 是否成功 */ - @SaAdminCheckPermission("shopTable:del") + @SaAdminCheckPermission(value = "shopTable:del", name = "台桌信息删除") @DeleteMapping public CzgResult remove(@RequestBody @Validated ShopTableDTO shopTableDTO) { return CzgResult.success(shopTableService.remove(new QueryWrapper().eq(ShopTable::getShopId, StpKit.USER.getShopId()).eq(ShopTable::getId, shopTableDTO.getId()))); @@ -117,7 +117,7 @@ public class ShopTableController { * 权限标识: shopTable:add * @return 是否成功 */ - @SaAdminCheckPermission("shopTable:add") + @SaAdminCheckPermission(value = "shopTable:add", name = "台桌信息增加") @PostMapping public CzgResult add(@RequestBody @Validated ShopTableAddDTO shopTableAddDTO) { if (shopTableAddDTO.getStart() >= shopTableAddDTO.getEnd()){ @@ -131,7 +131,7 @@ public class ShopTableController { * 权限标识: shopTable:bind * @return 是否成功 */ - @SaAdminCheckPermission("shopTable:bind") + @SaAdminCheckPermission(value = "shopTable:bind", name = "台桌绑定") @PostMapping("/bind") public CzgResult bind(@RequestBody @Validated ShopTableBindDTO shopTableBindDTO) { return CzgResult.success(shopTableService.bind(StpKit.USER.getShopId(), shopTableBindDTO)); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopTableService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopTableService.java index 8bf041db..256b486a 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopTableService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopTableService.java @@ -35,5 +35,5 @@ public interface ShopTableService extends IService { Boolean clear(long shopId, ShopTableClearDTO shopTableClearDTO); - Page pageInfo(Long shopId, Integer areaId, String tableCode, String status, String name); + Page pageInfo(Long shopId, Integer areaId, String tableCode, String status, String name, Boolean isBind); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopTableMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopTableMapper.java index 1f1cebc4..9f2aae6d 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopTableMapper.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopTableMapper.java @@ -16,5 +16,6 @@ import java.util.List; public interface ShopTableMapper extends BaseMapper { List pageInfo(@Param("shopId") Long shopId, @Param("areaId") Integer areaId, - @Param("tableCode") String tableCode, @Param("status") String status, @Param("name") String name); + @Param("tableCode") String tableCode, @Param("status") String status, @Param("name") String name, + @Param("isBind") Boolean isBind); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopTableServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopTableServiceImpl.java index 00164156..92dbfd3a 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopTableServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopTableServiceImpl.java @@ -270,8 +270,8 @@ public class ShopTableServiceImpl extends ServiceImpl pageInfo(Long shopId, Integer areaId, String tableCode, String status, String name) { + public Page pageInfo(Long shopId, Integer areaId, String tableCode, String status, String name, Boolean isBind) { PageHelper.startPage(PageUtil.buildPageHelp()); - return PageUtil.convert(new PageInfo<>(mapper.pageInfo(shopId, areaId, tableCode, status, name))); + return PageUtil.convert(new PageInfo<>(mapper.pageInfo(shopId, areaId, tableCode, status, name, isBind))); } } diff --git a/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml index 46d2fb2d..89f8de0d 100644 --- a/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml @@ -23,6 +23,9 @@ and a.name like concat('%', #{name}, '%') + + and a.table_code is not null + group by a.id ORDER BY a.create_time