From 13a3236249d21e1ed1a0f1e8ae20a29d6bf3913a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 26 九月 2025 17:49:11 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderMealController.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 d15881f..c0c4c77 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,8 +4,10 @@
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;
@@ -83,7 +85,11 @@
@PostMapping(value = "/amountSum")
public AjaxResult<AmountSumVO> amountSum(@RequestBody TOrderMealQuery query) {
query.setShopId(tokenService.getLoginUser().getObjectId());
- return AjaxResult.success(orderMealService.amountSum(query));
+ AmountSumVO amountSumVO = orderMealService.amountSum(query);
+ if(amountSumVO.getObligation().compareTo(BigDecimal.ZERO) < 0){
+ amountSumVO.setObligation(BigDecimal.ZERO);
+ }
+ return AjaxResult.success(amountSumVO);
}
@ApiOperation( value = "查询餐饮详情")
@@ -107,9 +113,11 @@
TBoard board = boardService.getById(orderMeal.getBoardId());
orderMealVO.setMaxPerson(board.getMaxPerson());
orderMealVO.setMinPerson(board.getMinPerson());
+ orderMealVO.setBoardName(board.getBoardName());
return AjaxResult.success(orderMealVO);
}
+ @Log(title = "餐饮-修改餐饮信息", businessType = BusinessType.UPDATE)
@ApiOperation( value = "修改")
@PostMapping(value = "/update")
public AjaxResult<String> update(@RequestBody TOrderMealDTO dto) {
@@ -130,6 +138,7 @@
}
return AjaxResult.success();
}
+ @Log(title = "餐饮-列表详情结账", businessType = BusinessType.UPDATE)
@ApiOperation( value = "列表详情结账")
@PostMapping(value = "/detailUpdate")
public AjaxResult<String> detailUpdate(@RequestBody TOrderMealDTO dto) {
@@ -148,18 +157,19 @@
}
return AjaxResult.success();
}
-
+ @Log(title = "餐饮订单-删除餐饮订单", businessType = BusinessType.DELETE)
@ApiOperation( value = "删除餐饮订单")
@GetMapping(value = "/deleteById")
public AjaxResult<Boolean> deleteById(@RequestParam(value = "id") Long id) {
- orderMealGoodsService.remove(Wrappers.lambdaQuery(TOrderMealGoods.class)
- .eq(TOrderMealGoods::getOrderId, id));
+// orderMealGoodsService.remove(Wrappers.lambdaQuery(TOrderMealGoods.class)
+// .eq(TOrderMealGoods::getOrderId, id));
return AjaxResult.success(orderMealService.removeById(id));
}
/**
* 添加餐饮管理
*/
+ @Log(title = "餐饮-开台", businessType = BusinessType.UPDATE)
@ApiOperation( value = "开台")
@PostMapping(value = "/startMeal")
public AjaxResult<Integer> startMeal(@RequestBody TOrderMeal dto) {
@@ -171,6 +181,7 @@
/**
* 添加餐饮管理
*/
+ @Log(title = "餐饮-点菜", businessType = BusinessType.UPDATE)
@ApiOperation( value = "点菜接口")
@PostMapping(value = "/add")
public AjaxResult<Integer> add(@RequestBody TOrderMealDTO dto) {
@@ -185,6 +196,7 @@
// return AjaxResult.success();
// }
+ @Log(title = "餐饮-结账", businessType = BusinessType.UPDATE)
@ApiOperation( value = "结账接口")
@PostMapping(value = "/checkout")
public AjaxResult<String> checkout(@Validated @RequestBody CheckoutDTO dto) {
@@ -195,6 +207,7 @@
/**
* 导出餐饮列表
*/
+ @Log(title = "餐饮-导出餐饮列表", businessType = BusinessType.UPDATE)
@ApiOperation(value = "导出餐饮列表")
@PostMapping("/exportOrderMeal")
public void exportOrderMeal(@RequestBody TOrderMealQuery query)
--
Gitblit v1.7.1