修改

xuhy

2024-09-07 df4e814dfe99159acd4efeb3bdaa079dde9178cb

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java

@@ -20,6 +20,7 @@
import org.springframework.util.CollectionUtils;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -51,13 +52,21 @@
        if(Objects.isNull(dto.getBoardId())){
            throw new RuntimeException("餐桌不能为空");
        }
        TOrderMeal orderMeal = this.getById(dto.getId());
        orderMeal.setRemark(orderMeal.getRemark()+dto.getRemark());
        orderMeal.setMealType(dto.getMealType());
        orderMeal.setMealPerson(dto.getMealPerson());
        orderMeal.setMealTime(dto.getMealTime());
        orderMeal.setOrderMoney(dto.getOrderMoney());
        this.updateById(orderMeal);

        // 查询菜品分类
        List<TGoodsType> list1 = goodsTypeService.list();
        // 查询餐桌
        TBoard board = boardService.getById(dto.getBoardId());
        // 如果菜品为空
        if(!CollectionUtils.isEmpty(dto.getMealOrderGoodsDTOS())){
            board.setStatus(BoardEnum.DURING_MEAL.getCode());
            boardService.updateById(board);
            // 订单金额，订单编号
            String orderNum = OrderNumConstants.MEAL+CodeGenerateUtils.generateOrderSn();
            dto.setOrderNum(orderNum);
@@ -79,20 +88,18 @@
                    orderMealGoods.add(orderMealGood);
                });
            });
            this.saveOrUpdate(dto);
            // 添加菜品
            orderMealGoods.forEach(item -> {
                item.setOrderId(dto.getId());
            });
            orderMealGoodsService.saveBatch(orderMealGoods);
            // 添加备注
            TOrderRemark tOrderRemark = new TOrderRemark();
            tOrderRemark.setOrderId(dto.getId());
            tOrderRemark.setRemark(dto.getRemark());
            tOrderRemark.setCreateTime(LocalDateTime.now());
            orderRemarkService.save(tOrderRemark);
//            TOrderRemark tOrderRemark = new TOrderRemark();
//            tOrderRemark.setOrderId(dto.getId());
//            tOrderRemark.setRemark(dto.getRemark());
//            tOrderRemark.setCreateTime(LocalDateTime.now());
//            orderRemarkService.save(tOrderRemark);
        }
        boardService.updateById(board);
    }

    @Override
@@ -123,11 +130,11 @@
        });
        orderMealGoodsService.saveBatch(orderMealGoods);
        // 添加备注
        TOrderRemark tOrderRemark = new TOrderRemark();
        tOrderRemark.setOrderId(dto.getOrderId());
        tOrderRemark.setRemark(dto.getRemark());
        tOrderRemark.setCreateTime(LocalDateTime.now());
        orderRemarkService.save(tOrderRemark);
//        TOrderRemark tOrderRemark = new TOrderRemark();
//        tOrderRemark.setOrderId(dto.getOrderId());
//        tOrderRemark.setRemark(dto.getRemark());
//        tOrderRemark.setCreateTime(LocalDateTime.now());
//        orderRemarkService.save(tOrderRemark);
    }

    @Override
@@ -343,6 +350,8 @@
        TBoard board = boardService.getById(dto.getBoardId());
        // 开台
        board.setStatus(BoardEnum.WAITING_ORDER.getCode());
        boardService.updateById(board);
        dto.setMealTime(LocalDate.now());
        this.save(dto);
    }