修改

xuhy

2024-09-07 97cf3094ce37ee629ca6b948a9317a7ed1796c18

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBoardController.java

@@ -1,16 +1,22 @@
package com.ruoyi.web.controller.api;


import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.domain. TBoard;
import com.ruoyi.system.domain.TOrderMeal;
import com.ruoyi.system.service.TBoardService;
import com.ruoyi.system.service. TBoardService;
import com.ruoyi.system.service.TOrderMealService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.parameters.P;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -26,10 +32,14 @@
public class TBoardController {

    private final TBoardService boardService;
    private final TokenService tokenService;
    private final TOrderMealService orderMealService;

    @Autowired
    public  TBoardController( TBoardService  boardService) {
    public  TBoardController(TBoardService  boardService, TokenService tokenService, TOrderMealService orderMealService) {
        this. boardService =  boardService;
        this.tokenService = tokenService;
        this.orderMealService = orderMealService;
    }

    /**
@@ -37,8 +47,26 @@
     */
    @ApiOperation( value = "查询餐桌列表")
    @PostMapping(value = "/list")
    public AjaxResult<List< TBoard>> list() {
        return AjaxResult.success( boardService.list());
    public AjaxResult<List<TBoard>> list() {
        Long objectId = tokenService.getLoginUser().getObjectId();
        List<TBoard> list = boardService.list(Wrappers.lambdaQuery(TBoard.class)
                .eq(TBoard::getShopId, objectId));
        // 不等于空闲状态的
        List<Long> ids = list.stream().filter(e -> !e.getStatus().equals(1)).map(TBoard::getId).collect(Collectors.toList());
        if(!CollectionUtils.isEmpty(ids)){
            List<TOrderMeal> orderMeals = orderMealService.list(Wrappers.lambdaQuery(TOrderMeal.class)
                    .in(TOrderMeal::getBoardId, ids));
            for (TBoard board : list) {
                List<TOrderMeal> collect = orderMeals.stream().filter(e -> board.getId().equals(e.getBoardId())).collect(Collectors.toList());
                if(!CollectionUtils.isEmpty(collect)){
                    board.setMealType(collect.get(0).getMealType());
                    board.setMealPerson(collect.get(0).getMealPerson());
                    board.setOrderMoney(collect.get(0).getOrderMoney());
                    board.setOrderMealId(collect.get(0).getId());
                }
            }
        }
        return AjaxResult.success(list);
    }

    /**
@@ -47,6 +75,7 @@
    @ApiOperation( value = "添加餐桌")
    @PostMapping(value = "/add")
    public AjaxResult<Boolean> add(@RequestBody  TBoard dto) {
        dto.setShopId(tokenService.getLoginUser().getObjectId());
        return AjaxResult.success( boardService.save(dto));
    }

@@ -60,11 +89,21 @@
    }

    /**
     * 根据店铺id查询餐桌列表
     */
    @ApiOperation( value = "根据店铺id查询餐桌列表")
    @GetMapping(value = "/getBoardByShopId")
    public AjaxResult<List<TBoard>> getBoardByShopId(@RequestParam("shopId") Long shopId) {
        return AjaxResult.success( boardService.list(Wrappers.lambdaQuery(TBoard.class)
                .eq(TBoard::getShopId,shopId)));
    }

    /**
     * 查看 餐桌详情
     */
    @ApiOperation( value = "查看餐桌详情")
    @GetMapping(value = "/getDetailById")
    public AjaxResult< TBoard> getDetailById(@RequestParam("id") Long id) {
    public AjaxResult<TBoard> getDetailById(@RequestParam("id") Long id) {
        return AjaxResult.success( boardService.getById(id));
    }