From 6f3e48f79f04989735054ef9903d86a74eae795b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 10 十二月 2024 10:17:12 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderMealController.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 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..711c10d 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
@@ -83,7 +83,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,6 +111,7 @@
TBoard board = boardService.getById(orderMeal.getBoardId());
orderMealVO.setMaxPerson(board.getMaxPerson());
orderMealVO.setMinPerson(board.getMinPerson());
+ orderMealVO.setBoardName(board.getBoardName());
return AjaxResult.success(orderMealVO);
}
@@ -114,30 +119,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