From 508f3e225df87e0da974424981e7782fc5ce875c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 19 五月 2025 14:21:39 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 deletions(-)
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 db5de50..dde905f 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
@@ -49,6 +49,8 @@
@Autowired
private TFoundationConfigService foundationConfigService;
@Autowired
+ private TFoundationPersonService foundationPersonService;
+ @Autowired
private TGoodsService goodsService;
@Autowired
private TOrderMealService orderMealService;
@@ -92,10 +94,10 @@
dataGenerator.setOtherPay(dto.getOtherProportion());
this.save(dataGenerator);
long start = System.currentTimeMillis();
- // 查询所有的人数用餐标准
- List<TFoundationConfigVO> foundationConfigs = foundationConfigService.getList(dto.getShopId());
+ TShop shop = shopService.getById(dto.getShopId());
+ List<TFoundationConfigVO> foundationConfigs = foundationConfigService.getList(shop.getMealType());
if(CollectionUtils.isEmpty(foundationConfigs)){
- throw new ServiceException("请先添加该店铺用餐标准");
+ throw new ServiceException("请先添加中餐或火锅用餐标准");
}
// 查询所有桌子
List<TBoard> boards = boardService.list(Wrappers.lambdaQuery(TBoard.class)
@@ -129,7 +131,13 @@
orderMeal.setMealType(1);
orderMeal.setMealPerson(random);
orderMeal.setMealTime(orderMealGeneratorCountDTO.getTime());
- orderMeal.setOrderNum(OrderNumConstants.MEAL + CodeGenerateUtils.generateVolumeSn());
+ String num = OrderNumConstants.MEAL + CodeGenerateUtils.generateVolumeSn();
+// long count1 = orderMealService.count(Wrappers.lambdaQuery(TOrderMeal.class)
+// .eq(TOrderMeal::getOrderNum, num));
+// if(count1>0){
+// num = CodeGenerateUtils.generateVolumeSn();
+// }
+ orderMeal.setOrderNum(num);
orderMeal.setStatus(2);
List<TOrderMealGoods> orderMealGoods = new ArrayList<>();
// 获取当前桌的菜品
@@ -152,7 +160,7 @@
if (good.getGoodsNum().equals(typeGood.getGoodsNum())) {
count+=1;
good.setGoodsCount(good.getGoodsCount() + 1);
- good.setGoodsSalePrice(good.getGoodsSalePrice().add(typeGood.getSalePrice()));
+// good.setGoodsSalePrice(good.getGoodsSalePrice().add(typeGood.getSalePrice()));
break; // 找到后直接跳出循环
}
}
@@ -370,10 +378,15 @@
// 查询上一次开始之后的订单数据
List<TOrderSale> orderSales1 = orderSaleService.list(new LambdaQueryWrapper<TOrderSale>().gt(TOrderSale::getOrderTime, startTime1));
List<Long> saleIds1 = orderSales1.stream().map(TOrderSale::getId).collect(Collectors.toList());
- // 查询上一次的商品
- List<TOrderSaleGoods> list = orderSaleGoodsService.list(new LambdaQueryWrapper<TOrderSaleGoods>().in(TOrderSaleGoods::getOrderId, saleIds1));
- // 结合上次最后一次的数据
- list.addAll(orderSaleGoodsList);
+ List<TOrderSaleGoods> list;
+ if(CollectionUtils.isEmpty(saleIds1)){
+ // 查询上一次的商品
+ list = orderSaleGoodsService.list(new LambdaQueryWrapper<TOrderSaleGoods>().in(TOrderSaleGoods::getOrderId, saleIds1));
+ // 结合上次最后一次的数据
+ list.addAll(orderSaleGoodsList);
+ }else {
+ list = orderSaleGoodsList;
+ }
// 删除上一次的数据生成 新生成一条数据
TOrderStock orderStock = new TOrderStock();
orderStock.setStockNum(OrderNumConstants.STOCK + CodeGenerateUtils.generateVolumeSn());
@@ -683,9 +696,15 @@
// 统计支付金额
Map<String, Object> map = orderStockService.getDataGeneratorStockDetail(query);
Integer totalStock = Integer.parseInt(map.get("totalStock").toString());
- BigDecimal stockAmountSum = new BigDecimal(map.get("stockAmountSum").toString());
+// BigDecimal stockAmountSum = new BigDecimal(map.get("stockAmountSum").toString());
data.setTotalStock(totalStock);
- data.setStockAmountSum(stockAmountSum);
+ List<TOrderStock> list = orderStockService.list(Wrappers.lambdaQuery(TOrderStock.class)
+ .eq(TOrderStock::getGeneratorId, query.getGeneratorId()));
+ if(CollectionUtils.isEmpty(list)){
+ data.setStockAmountSum(BigDecimal.ZERO);
+ }else {
+ data.setStockAmountSum(list.stream().filter(e->Objects.nonNull(e.getStockTotalPrice())).map(TOrderStock::getStockTotalPrice).reduce(BigDecimal.ZERO, BigDecimal::add));
+ }
return data;
}
@@ -694,6 +713,11 @@
return null;
}
+ @Override
+ public void deleteByShopId(Long shopId) {
+ this.baseMapper.deleteByShopId(shopId);
+ }
+
private int getRandomPayType(Integer size,BigDecimal count) {
BigDecimal bigDecimal = new BigDecimal(size).multiply(count.divide(new BigDecimal(100))).setScale(0, BigDecimal.ROUND_FLOOR);
return Integer.parseInt(bigDecimal.toString());
--
Gitblit v1.7.1