From abfedddb15ff90b7810a231dac964d2450372b94 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 10 九月 2024 09:01:42 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderMealController.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 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 6d22d99..a4710ab 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
@@ -9,13 +9,14 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.WebUtils;
import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.domain.TGoodsType;
import com.ruoyi.system.domain.TOrderMeal;
import com.ruoyi.system.domain.TOrderMealGoods;
-import com.ruoyi.system.dto.AddDishDTO;
import com.ruoyi.system.dto.CheckoutDTO;
import com.ruoyi.system.dto.TOrderMealDTO;
import com.ruoyi.system.export.TOrderMealExportExcel;
import com.ruoyi.system.query.TOrderMealQuery;
+import com.ruoyi.system.service.TGoodsTypeService;
import com.ruoyi.system.service.TOrderMealGoodsService;
import com.ruoyi.system.service.TOrderMealService;
import com.ruoyi.system.vo.AmountSumVO;
@@ -51,12 +52,14 @@
private final TOrderMealService orderMealService;
private final TOrderMealGoodsService orderMealGoodsService;
+ private final TGoodsTypeService goodsTypeService;
private final TokenService tokenService;
@Autowired
- public TOrderMealController(TOrderMealService orderMealService, TOrderMealGoodsService orderMealGoodsService, TokenService tokenService) {
+ public TOrderMealController(TOrderMealService orderMealService, TOrderMealGoodsService orderMealGoodsService, TGoodsTypeService goodsTypeService, TokenService tokenService) {
this.orderMealService = orderMealService;
this.orderMealGoodsService = orderMealGoodsService;
+ this.goodsTypeService = goodsTypeService;
this.tokenService = tokenService;
}
@@ -92,6 +95,25 @@
return AjaxResult.success(orderMealVO);
}
+ @ApiOperation( value = "修改")
+ @PostMapping(value = "/update")
+ public AjaxResult<String> update(@RequestBody TOrderMealDTO dto) {
+ // 删除所有菜品
+ orderMealGoodsService.remove(Wrappers.lambdaQuery(TOrderMealGoods.class)
+ .eq(TOrderMealGoods::getOrderId, dto.getId()));
+ orderMealService.updateById(dto);
+ for (TOrderMealGoods mealOrderGood : dto.getMealOrderGoods()) {
+ // 设置商品类型和类型id
+ TGoodsType goodsType = goodsTypeService.getById(mealOrderGood.getTypeId());
+ mealOrderGood.setId(null);
+ mealOrderGood.setOrderId(dto.getId());
+ mealOrderGood.setTypeId(goodsType.getId());
+ mealOrderGood.setTypeName(goodsType.getTypeName());
+ }
+ orderMealGoodsService.saveBatch(dto.getMealOrderGoods());
+ return AjaxResult.success();
+ }
+
@ApiOperation( value = "删除餐饮订单")
@GetMapping(value = "/deleteById")
public AjaxResult<Boolean> deleteById(@RequestParam(value = "id") Long id) {
@@ -121,12 +143,12 @@
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