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 4164d002..44692a5a 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 @@ -3,6 +3,7 @@ package com.czg.controller.admin; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.czg.account.dto.table.ShopTableAddDTO; +import com.czg.account.dto.table.ShopTableBindDTO; import com.czg.account.dto.table.ShopTableDTO; import com.czg.account.entity.ShopTable; import com.czg.account.service.ShopTableService; @@ -100,4 +101,15 @@ public class ShopTableController { } return CzgResult.success(shopTableService.add(StpKit.USER.getShopId(), shopTableAddDTO)); } + + /** + * 台桌绑定 + * 权限标识: shopTable:bind + * @return 是否成功 + */ + @SaAdminCheckPermission("shopTable:bind") + @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/dto/table/ShopTableBindDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/table/ShopTableBindDTO.java new file mode 100644 index 00000000..722bf233 --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/table/ShopTableBindDTO.java @@ -0,0 +1,23 @@ +package com.czg.account.dto.table; + +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + + +/** + * @author Administrator + */ +@Data +public class ShopTableBindDTO { + /** + * 台桌id + */ + @NotNull(message = "台桌id不为空") + private String id; + /** + * 桌码 + */ + @NotEmpty(message = "桌码不为空") + private String tableCode; +} 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 81796cfb..13a78a48 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 @@ -1,6 +1,7 @@ package com.czg.account.service; import com.czg.account.dto.table.ShopTableAddDTO; +import com.czg.account.dto.table.ShopTableBindDTO; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; import com.czg.account.entity.ShopTable; @@ -19,4 +20,7 @@ public interface ShopTableService extends IService { Boolean add(Long shopId, ShopTableAddDTO shopTableAddDTO); void createQrCode(Long shopId, Integer num, HttpServletResponse response) throws IOException; + + Boolean bind(Long shopId, ShopTableBindDTO shopTableBindDTO); + } 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 d88e53df..81606313 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 @@ -1,10 +1,12 @@ package com.czg.service.account.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.img.ImgUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.qrcode.QrCodeUtil; import com.czg.account.dto.table.ShopTableAddDTO; +import com.czg.account.dto.table.ShopTableBindDTO; import com.czg.account.entity.ShopTableArea; import com.czg.account.entity.ShopTableCode; import com.czg.account.service.ShopAreaService; @@ -135,4 +137,33 @@ public class ShopTableServiceImpl extends ServiceImpl