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/TOrderStockController.java | 4 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java | 10 ----
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java | 35 +++++++++++------
ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml | 12 +++--
ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderMeal.java | 9 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBoardController.java | 1
ruoyi-system/src/main/java/com/ruoyi/system/domain/TBoard.java | 3 +
ruoyi-system/src/main/java/com/ruoyi/system/dto/TOrderMealDTO.java | 2 -
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java | 19 ++++++++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderMealController.java | 12 +++---
11 files changed, 68 insertions(+), 41 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBoardController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBoardController.java
index 9d1e7f4..c725554 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBoardController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBoardController.java
@@ -62,6 +62,7 @@
board.setMealType(collect.get(0).getMealType());
board.setMealPerson(collect.get(0).getMealPerson());
board.setOrderMoney(collect.get(0).getOrderMoney());
+ board.setOrderMealId(collect.get(0).getId());
}
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java
index 6e4f3c9..713c39c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java
@@ -142,7 +142,7 @@
for (TOrderMealVO orderMealVO : list) {
TOrderMealExportExcel tOrderMealExportExcel = new TOrderMealExportExcel();
BeanUtils.copyProperties(orderMealVO, tOrderMealExportExcel);
- tOrderMealExportExcel.setCreateStrTime(DateUtils.localDateTimeToString(orderMealVO.getCreateTime()));
+ tOrderMealExportExcel.setCreateStrTime(DateUtils.localDateToString(orderMealVO.getMealTime()));
tOrderMealExportExcel.setGoodsList(orderMealVO.getGoodsList().stream().collect(Collectors.joining("\n")));
}
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TOrderMealExportExcel.class, orderMeals);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java
index 1453827..bcdbc55 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java
@@ -3,10 +3,13 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.domain.TGoods;
+import com.ruoyi.system.domain.TGoodsType;
import com.ruoyi.system.query.TGoodsQuery;
import com.ruoyi.system.service.TGoodsService;
+import com.ruoyi.system.service.TGoodsTypeService;
import com.ruoyi.system.vo.TGoodsVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -14,6 +17,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -29,11 +33,13 @@
public class TGoodsController {
private final TGoodsService goodsService;
+ private final TGoodsTypeService goodsTypeService;
private final TokenService tokenService;
@Autowired
- public TGoodsController(TGoodsService goodsService, TokenService tokenService) {
+ public TGoodsController(TGoodsService goodsService, TGoodsTypeService goodsTypeService, TokenService tokenService) {
this.goodsService = goodsService;
+ this.goodsTypeService = goodsTypeService;
this.tokenService = tokenService;
}
@@ -74,8 +80,15 @@
*/
@ApiOperation( value = "查看商品管理详情")
@GetMapping(value = "/getDetailById")
- public AjaxResult<TGoods> getDetailById(@RequestParam("id") Long id) {
- return AjaxResult.success(goodsService.getById(id));
+ public AjaxResult<TGoodsVO> getDetailById(@RequestParam("id") Long id) {
+ TGoods goods = goodsService.getById(id);
+ TGoodsVO tGoodsVO = new TGoodsVO();
+ BeanUtils.copyProperties(goods, tGoodsVO);
+ TGoodsType goodsType = goodsTypeService.getById(goods.getTypeId());
+ if(Objects.nonNull(goodsType)){
+ tGoodsVO.setTypeName(goodsType.getTypeName());
+ }
+ return AjaxResult.success(tGoodsVO);
}
/**
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..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
@@ -121,12 +121,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")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderStockController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderStockController.java
index 7d14906..a45038d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderStockController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderStockController.java
@@ -99,7 +99,7 @@
// 删除进货商品
orderStockGoodsService.remove(Wrappers.lambdaQuery(TOrderStockGoods.class)
.eq(TOrderStockGoods::getOrderId, id));
- return AjaxResult.success(orderStockGoodsService.removeById(id));
+ return AjaxResult.success(orderStockService.removeById(id));
}
/**
@@ -110,7 +110,7 @@
public AjaxResult<Boolean> deleteByIds(@RequestBody List<Long> ids) {
orderStockGoodsService.remove(Wrappers.lambdaQuery(TOrderStockGoods.class)
.in(TOrderStockGoods::getOrderId, ids));
- return AjaxResult.success(orderStockGoodsService.removeByIds(ids));
+ return AjaxResult.success(orderStockService.removeByIds(ids));
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TBoard.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TBoard.java
index 1e54ce8..9b900c8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TBoard.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TBoard.java
@@ -61,5 +61,8 @@
@ApiModelProperty(value = "订单金额")
@TableField(exist = false)
private BigDecimal orderMoney;
+ @ApiModelProperty(value = "餐饮id")
+ @TableField(exist = false)
+ private Long orderMealId;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderMeal.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderMeal.java
index d5faf30..30b0729 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderMeal.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderMeal.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -9,6 +10,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -71,6 +73,13 @@
@ApiModelProperty(value = "店铺id")
@TableField("shopId")
private Long shopId;
+ @ApiModelProperty(value = "备注")
+ @TableField("remark")
+ private String remark;
+ @ApiModelProperty(value = "开台日期")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @TableField("mealTime")
+ private LocalDate mealTime;
@ApiModelProperty(value = "商品集合")
@TableField(exist = false)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/TOrderMealDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TOrderMealDTO.java
index 8bde256..c73ee57 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/TOrderMealDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TOrderMealDTO.java
@@ -15,6 +15,4 @@
@ApiModelProperty(value = "菜品集合")
private List<MealOrderGoodsDTO> mealOrderGoodsDTOS;
- @ApiModelProperty(value = "备注")
- private String remark;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java
index 6f8a49d..5f4dfb1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java
@@ -101,6 +101,7 @@
orderMeal.setBoardId(board.getId());
orderMeal.setMealType(1);
orderMeal.setMealPerson(random);
+ orderMeal.setMealTime(orderMealGeneratorCountDTO.getTime());
orderMeal.setOrderNum(OrderNumConstants.MEAL + CodeGenerateUtils.generateOrderSn());
orderMeal.setStatus(2);
List<TOrderMealGoods> orderMealGoods = new ArrayList<>();
@@ -553,13 +554,4 @@
return selected;
}
- public static void main(String[] args) {
-// System.err.println(new Random().nextInt(1 - 0 + 1) + 0);
- List<Integer> list = new ArrayList<>();
- list.add(1);
- list.add(2);
- list.add(3);
- list.add(4);
- System.err.println(list.subList(1,2));
- }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java
index fc3a243..f993b5e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java
+++ b/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);
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml
index 6d1c034..ed0a447 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml
@@ -21,17 +21,19 @@
<result column="isCover" property="isCover" />
<result column="shopId" property="shopId" />
<result column="generatorId" property="generatorId" />
+ <result column="remark" property="remark" />
+ <result column="mealTime" property="mealTime" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, boardId, mealType, mealPerson, orderMoney, payMoney, payType, createTime, updateTime, disabled,
- createBy, updateBy, orderNum, status,isCover,shopId,generatorId
+ createBy, updateBy, orderNum, status,isCover,shopId,generatorId,remark
</sql>
<select id="pageList" resultType="com.ruoyi.system.vo.TOrderMealVO">
select
tom.id, tom.boardId, tom.mealType, tom.mealPerson, tom.orderMoney, tom.payMoney, tom.payType, tom.createTime, tom.updateTime, tom.disabled,
- tom.createBy, tom.updateBy, tom.orderNum, tom.status,tom.isCover,tom.shopId,tom.generatorId,tb.boardName
+ tom.createBy, tom.updateBy, tom.orderNum, tom.status,tom.isCover,tom.shopId,tom.generatorId,tom.remark,tom.mealTime,tb.boardName
from t_order_meal tom
left join t_board tb on tb.id = tom.boardId
<where>
@@ -108,7 +110,7 @@
<select id="exportOrderMeal" resultType="com.ruoyi.system.vo.TOrderMealVO">
select
tom.id, tom.boardId, tom.mealType, tom.mealPerson, tom.orderMoney, tom.payMoney, tom.payType, tom.createTime, tom.updateTime, tom.disabled,
- tom.createBy, tom.updateBy, tom.orderNum, tom.status,tom.isCover,tom.shopId,tb.boardName
+ tom.createBy, tom.updateBy, tom.orderNum, tom.status,tom.isCover,tom.shopId,tom.remark,tom.mealTime,tb.boardName
from t_order_meal tom
left join t_board tb on tb.id = tom.boardId
<where>
@@ -167,7 +169,7 @@
<select id="pageListGenerator" resultType="com.ruoyi.system.vo.TOrderMealVO">
select
tom.id, tom.boardId, tom.mealType, tom.mealPerson, tom.orderMoney, tom.payMoney, tom.payType, tom.createTime, tom.updateTime, tom.disabled,
- tom.createBy, tom.updateBy, tom.orderNum, tom.status,tom.isCover,tom.shopId,tom.generatorId,tb.boardName
+ tom.createBy, tom.updateBy, tom.orderNum, tom.status,tom.isCover,tom.shopId,tom.generatorId,tom.remark,tom.mealTime,tb.boardName
from t_order_meal tom
left join t_board tb on tb.id = tom.boardId
<where>
@@ -211,7 +213,7 @@
<select id="mealGeneratorExport" resultType="com.ruoyi.system.vo.TOrderMealVO">
select
tom.id, tom.boardId, tom.mealType, tom.mealPerson, tom.orderMoney, tom.payMoney, tom.payType, tom.createTime, tom.updateTime, tom.disabled,
- tom.createBy, tom.updateBy, tom.orderNum, tom.status,tom.isCover,tom.shopId,tb.boardName
+ tom.createBy, tom.updateBy, tom.orderNum, tom.status,tom.isCover,tom.shopId,tom.remark,tom.mealTime,tb.boardName
from t_order_meal tom
left join t_board tb on tb.id = tom.boardId
<where>
--
Gitblit v1.7.1