From df4e814dfe99159acd4efeb3bdaa079dde9178cb Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 07 九月 2024 11:20:43 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderMealController.java | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderMealController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderMealController.java
index 7c87b5b..fd98610 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderMealController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderMealController.java
@@ -4,10 +4,8 @@
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.WebUtils;
import com.ruoyi.framework.web.service.TokenService;
@@ -16,13 +14,11 @@
import com.ruoyi.system.dto.AddDishDTO;
import com.ruoyi.system.dto.CheckoutDTO;
import com.ruoyi.system.dto.TOrderMealDTO;
-import com.ruoyi.system.importExcel.TOrderMealExportExcel;
-import com.ruoyi.system.query.SysUserQuery;
+import com.ruoyi.system.export.TOrderMealExportExcel;
import com.ruoyi.system.query.TOrderMealQuery;
import com.ruoyi.system.service.TOrderMealGoodsService;
import com.ruoyi.system.service.TOrderMealService;
import com.ruoyi.system.vo.AmountSumVO;
-import com.ruoyi.system.vo.SysUserVO;
import com.ruoyi.system.vo.TOrderMealVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -38,8 +34,6 @@
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
-import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -109,20 +103,30 @@
/**
* 添加餐饮管理
*/
- @ApiOperation( value = "开台-点菜接口")
+ @ApiOperation( value = "开台")
+ @PostMapping(value = "/startMeal")
+ public AjaxResult<Integer> startMeal(@RequestBody TOrderMeal dto) {
+ dto.setShopId(tokenService.getLoginUser().getObjectId());
+ orderMealService.startMeal(dto);
+ return AjaxResult.success(dto.getId());
+ }
+
+ /**
+ * 添加餐饮管理
+ */
+ @ApiOperation( value = "点菜接口")
@PostMapping(value = "/add")
public AjaxResult<Integer> add(@RequestBody TOrderMealDTO dto) {
- dto.setShopId(tokenService.getLoginUser().getObjectId());
orderMealService.add(dto);
return AjaxResult.success(dto.getId());
}
- @ApiOperation( value = "加菜接口")
- @PostMapping(value = "/addDish")
- public AjaxResult<String> addDish(@Validated @RequestBody AddDishDTO dto) {
- orderMealService.addDish(dto);
- return AjaxResult.success();
- }
+// @ApiOperation( value = "加菜接口")
+// @PostMapping(value = "/addDish")
+// public AjaxResult<String> addDish(@Validated @RequestBody AddDishDTO dto) {
+// orderMealService.addDish(dto);
+// return AjaxResult.success();
+// }
@ApiOperation( value = "结账接口")
@PostMapping(value = "/checkout")
--
Gitblit v1.7.1