后厨 权限
This commit is contained in:
@@ -59,7 +59,7 @@ public class BkContactListController {
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 预约端-台桌:查询预约单列表
|
* 预约端-预定单:查询预约单列表
|
||||||
*/
|
*/
|
||||||
// @SaAdminCheckPermission(value = "bk:bkOrder:bookings", name = "预约端-预约单:列表")
|
// @SaAdminCheckPermission(value = "bk:bkOrder:bookings", name = "预约端-预约单:列表")
|
||||||
@GetMapping("/bkOrder/bookings")
|
@GetMapping("/bkOrder/bookings")
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ public class TableController {
|
|||||||
* 按台桌查看
|
* 按台桌查看
|
||||||
*/
|
*/
|
||||||
@GetMapping("getKitchenTable")
|
@GetMapping("getKitchenTable")
|
||||||
@SaAdminCheckPermission(value = "kitchen:table", name = "后厨-按台桌查看")
|
// @SaAdminCheckPermission(value = "kitchen:table", name = "后厨-按台桌查看")
|
||||||
public CzgResult<List<KitchenTableVO>> getKitchenTable(@RequestParam(required = false) String tableName, @RequestParam(required = false) Long areaId) {
|
public CzgResult<List<KitchenTableVO>> getKitchenTable(@RequestParam(required = false) String tableName, @RequestParam(required = false) Long areaId) {
|
||||||
Long shopId = StpKit.USER.getShopId();
|
Long shopId = StpKit.USER.getShopId();
|
||||||
List<KitchenTableVO> kitchenTables = kitchenDetailMapper.getKitchenTable(shopId, tableName, areaId);
|
List<KitchenTableVO> kitchenTables = kitchenDetailMapper.getKitchenTable(shopId, tableName, areaId);
|
||||||
@@ -46,7 +46,7 @@ public class TableController {
|
|||||||
* 按台桌查看 商品内容
|
* 按台桌查看 商品内容
|
||||||
*/
|
*/
|
||||||
@GetMapping("getKitchenTableFoods")
|
@GetMapping("getKitchenTableFoods")
|
||||||
@SaAdminCheckPermission(value = "kitchen:tableFood", name = "后厨-按台桌查看商品内容")
|
// @SaAdminCheckPermission(value = "kitchen:tableFood", name = "后厨-按台桌查看商品内容")
|
||||||
public CzgResult<List<KitchenTableFoodVO>> getKitchenTableFoods(@RequestParam(required = false) Long orderId,
|
public CzgResult<List<KitchenTableFoodVO>> getKitchenTableFoods(@RequestParam(required = false) Long orderId,
|
||||||
@RequestParam(required = false) String tableCode,
|
@RequestParam(required = false) String tableCode,
|
||||||
@RequestParam(required = false) Long isNoTable) {
|
@RequestParam(required = false) Long isNoTable) {
|
||||||
@@ -63,7 +63,7 @@ public class TableController {
|
|||||||
* 按商品查看
|
* 按商品查看
|
||||||
*/
|
*/
|
||||||
@GetMapping("getKitchenFood")
|
@GetMapping("getKitchenFood")
|
||||||
@SaAdminCheckPermission(value = "kitchen:table", name = "后厨-按台桌查看")
|
// @SaAdminCheckPermission(value = "kitchen:table", name = "后厨-按台桌查看")
|
||||||
public CzgResult<List<KitchenFoodVO>> getKitchenFood(@RequestParam(required = false) String productName) {
|
public CzgResult<List<KitchenFoodVO>> getKitchenFood(@RequestParam(required = false) String productName) {
|
||||||
Long shopId = StpKit.USER.getShopId();
|
Long shopId = StpKit.USER.getShopId();
|
||||||
List<KitchenFoodVO> kitchenFood = kitchenDetailMapper.getKitchenFood(shopId, productName);
|
List<KitchenFoodVO> kitchenFood = kitchenDetailMapper.getKitchenFood(shopId, productName);
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ public class BkTableVO {
|
|||||||
private List<BkTableVO.TableVO> tables;
|
private List<BkTableVO.TableVO> tables;
|
||||||
|
|
||||||
record TableVO(
|
record TableVO(
|
||||||
String tableName, List<BkOrder> bkOrders
|
Long tableId,String tableName, List<BkOrder> bkOrders
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<select id="bookings" resultType="com.czg.account.entity.BkOrder">
|
<select id="bookings" resultType="com.czg.account.entity.BkOrder">
|
||||||
SELECT
|
SELECT
|
||||||
o.*, IFNULL(GROUP_CONCAT(DISTINCT t.name SEPARATOR '、'), '') AS tableInFos
|
o.*, IFNULL(GROUP_CONCAT(DISTINCT t.table_name SEPARATOR '、'), '') AS tableInFos
|
||||||
FROM bk_order o
|
FROM bk_order o
|
||||||
LEFT JOIN bk_order_table t ON t.book_order_id = o.id
|
LEFT JOIN bk_order_table t ON t.book_order_id = o.id
|
||||||
WHERE o.shop_id = #{shopId}
|
WHERE o.shop_id = #{shopId}
|
||||||
|
|||||||
Reference in New Issue
Block a user