From 02ceb2d54e6aeec1aaf7f8ce1252840e3594ce66 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 25 八月 2025 14:50:22 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
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 6c95673..99e1d9c 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
@@ -283,6 +283,7 @@
.eq(TOrderMeal::getShopId, query.getShopId())
.ge(TOrderMeal::getMealTime, query.getStartTime())
.le(TOrderMeal::getMealTime, query.getEndTime())
+ .eq(TOrderMeal::getIsCover,1)
.eq(TOrderMeal::getStatus,2));
List<Long> ids = list.stream().map(TOrderMeal::getId).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(ids)){
@@ -444,7 +445,7 @@
// 开台
board.setStatus(BoardEnum.WAITING_ORDER.getCode());
boardService.updateById(board);
- dto.setMealTime(LocalDate.now());
+ dto.setMealTime(dto.getMealTime());
dto.setOrderNum(OrderNumConstants.MEAL + CodeGenerateUtils.generateVolumeSn());
this.save(dto);
}
@@ -523,8 +524,8 @@
sumGeneratorClient.setPerAmountSum(sumGeneratorDetailClient.stream().map(SumGeneratorDetailClient::getPerAmount).reduce(BigDecimal::add).get());
sumGeneratorClient.setAllMoney(sumGeneratorDetailClient.stream().map(SumGeneratorDetailClient::getActualAmount).reduce(BigDecimal::add).get());
- sumGeneratorClient.setSingleAvgAmount(sumGeneratorClient.getAllMoney().divide(new BigDecimal(sumGeneratorClient.getPerCountSum()),2,BigDecimal.ROUND_DOWN));
- sumGeneratorClient.setPerCapitaAmount(sumGeneratorClient.getAllMoney().divide(new BigDecimal(sumGeneratorClient.getOrderCountSum()),2,BigDecimal.ROUND_DOWN));
+ sumGeneratorClient.setSingleAvgAmount(sumGeneratorClient.getAllMoney().divide(new BigDecimal(sumGeneratorClient.getOrderCountSum()),2,BigDecimal.ROUND_DOWN));
+ sumGeneratorClient.setPerCapitaAmount(sumGeneratorClient.getAllMoney().divide(new BigDecimal(sumGeneratorClient.getPerCountSum()),2,BigDecimal.ROUND_DOWN));
}
sumGeneratorClient.setOrderStatistics(sumGeneratorDetailClient);
--
Gitblit v1.7.1