From 7e0413895354b1a6a0e2d23eb7483a3713cd4b14 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 14 九月 2024 16:14:40 +0800
Subject: [PATCH] 修改接口

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderMealController.java |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 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 08524ab..d15881f 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
@@ -114,30 +114,32 @@
     @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());
+        if(!CollectionUtils.isEmpty(dto.getMealOrderGoods())){
+            orderMealGoodsService.remove(Wrappers.lambdaQuery(TOrderMealGoods.class)
+                    .eq(TOrderMealGoods::getOrderId, dto.getId()));
+            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());
         }
-        orderMealGoodsService.saveBatch(dto.getMealOrderGoods());
         return AjaxResult.success();
     }
     @ApiOperation( value = "列表详情结账")
     @PostMapping(value = "/detailUpdate")
     public AjaxResult<String> detailUpdate(@RequestBody TOrderMealDTO dto) {
-        // 删除所有菜品
-        orderMealGoodsService.remove(Wrappers.lambdaQuery(TOrderMealGoods.class)
-                .eq(TOrderMealGoods::getOrderId, dto.getId()));
         orderMealService.updateById(dto);
         // 查询餐桌
         List<TOrderMealGoods> mealOrderGoods = dto.getMealOrderGoods();
         if (!CollectionUtils.isEmpty(mealOrderGoods)) {
+            // 删除所有菜品
+            orderMealGoodsService.remove(Wrappers.lambdaQuery(TOrderMealGoods.class)
+                    .eq(TOrderMealGoods::getOrderId, dto.getId()));
             for (TOrderMealGoods mealOrderGood : mealOrderGoods) {
                 // 设置商品类型和类型id
                 mealOrderGood.setId(null);

--
Gitblit v1.7.1