diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/BkContactListController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/BkContactListController.java index ff9c80bd6..f540911cc 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/BkContactListController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/BkContactListController.java @@ -4,6 +4,7 @@ import com.czg.account.dto.BkOrderDTO; import com.czg.account.dto.calltable.CallTablePage; import com.czg.account.entity.BkContactList; import com.czg.account.entity.BkOrder; +import com.czg.account.entity.BkOrderTable; import com.czg.account.service.BkContactListService; import com.czg.account.service.BkOrderService; import com.czg.account.vo.BkTableVO; @@ -71,6 +72,16 @@ public class BkContactListController { return CzgResult.success(tables); } + /** + * 预约端-预定单:查询预约单选中台桌 + */ +// @SaAdminCheckPermission(value = "bk:bkOrder:bookings/tables", name = "预约端-预约单:查询预约单选中的台桌") + @GetMapping("/bkOrder/bookings/tables") + public CzgResult> bookingTables(Long id) { + List tables = bkOrderService.bookingTables(StpKit.USER.getShopId(), id); + return CzgResult.success(tables); + } + /** * 预约端-预约单:预约/修改预约 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/BkOrderService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/BkOrderService.java index e0c6422ad..7fc489c88 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/BkOrderService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/BkOrderService.java @@ -1,6 +1,7 @@ package com.czg.account.service; import com.czg.account.dto.BkOrderDTO; +import com.czg.account.entity.BkOrderTable; import com.czg.account.vo.BkTableVO; import com.mybatisflex.core.service.IService; import com.czg.account.entity.BkOrder; @@ -27,6 +28,14 @@ public interface BkOrderService extends IService { */ List bookings(Long shopId, String search, LocalDate start, LocalDate end, String status); + /** + * 查询预约单的台桌列表 + * @param shopId 店铺id + * @param bkOrderId 预约单id + * @return 预约单的台桌列表 + */ + List bookingTables(Long shopId, Long bkOrderId); + /** * 预约 */ diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkOrderServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkOrderServiceImpl.java index ed06cdbd5..2b22c2497 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkOrderServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkOrderServiceImpl.java @@ -42,6 +42,11 @@ public class BkOrderServiceImpl extends ServiceImpl impl return mapper.bookings(shopId, search, start, end, status); } + @Override + public List bookingTables(Long shopId, Long bkOrderId) { + return tableMapper.selectListByQuery(QueryWrapper.create().eq(BkOrderTable::getBookOrderId, bkOrderId).eq(BkOrderTable::getShopId, shopId)); + } + @Override public void booking(Long shopId, BkOrderDTO bkOrder) {