From 660f4451c140a9da1f4bb92721a403b128dbdaf7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 30 十月 2024 17:15:26 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBoardController.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBoardController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBoardController.java
index 6c11cc9..460a18c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBoardController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBoardController.java
@@ -3,15 +3,21 @@
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.Comparator;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -27,10 +33,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;
}
/**
@@ -39,7 +49,27 @@
@ApiOperation( value = "查询餐桌列表")
@PostMapping(value = "/list")
public AjaxResult<List<TBoard>> list() {
- return AjaxResult.success( boardService.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)
+ .isNotNull(TOrderMeal::getMealTime)
+ .orderByDesc(TOrderMeal::getCreateTime));
+ for (TBoard board : list) {
+ List<TOrderMeal> collect = orderMeals.stream().filter(e -> board.getId().equals(e.getBoardId())).sorted(Comparator.comparing(TOrderMeal::getCreateTime).reversed()).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);
}
/**
@@ -48,6 +78,7 @@
@ApiOperation( value = "添加餐桌")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@RequestBody TBoard dto) {
+ dto.setShopId(tokenService.getLoginUser().getObjectId());
return AjaxResult.success( boardService.save(dto));
}
--
Gitblit v1.7.1