From 0ea54edfb4d2ad45b50529247fd1d8caef053c07 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 31 十月 2024 14:24:39 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 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 c4cd614..59a7751 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)
@@ -115,9 +117,12 @@
for (OrderMealGeneratorCountDTO orderMealGeneratorCountDTO : orderMealGeneratorCountDTOS) {
TBoard board = boards.stream().filter(e -> e.getId().equals(orderMealGeneratorCountDTO.getBoardId())).findFirst().orElse(null);
if(Objects.isNull(board)){
- throw new ServiceException("桌台用餐人数配置不存在");
+ throw new ServiceException("该桌台信息不存在");
}
Integer orderCount = orderMealGeneratorCountDTO.getOrderCount();
+ if(orderCount == 0){
+ continue;
+ }
// 查询当前桌的用餐人数
for (int i = 1; i <= orderCount; i++) {
int random = getRandom(board.getMinPerson(), board.getMaxPerson());
@@ -126,23 +131,36 @@
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<>();
// 获取当前桌的菜品
List<TFoundationConfigVO> foundationConfigVOS = foundationConfigs.stream().filter(e -> e.getMealCount().equals(random)).collect(Collectors.toList());
+ if(CollectionUtils.isEmpty(foundationConfigVOS)){
+ throw new ServiceException("桌台"+random+"人餐，人数配置不存在");
+ }
// 每种菜品分类需要几个菜的生成
foundationConfigVOS.forEach(e -> {
int random1 = getRandom(e.getMinCount(), e.getMaxCount());
- List<TGoods> typeGoods = goods.stream().filter(m -> e.getTypeId().equals(m.getTypeId())).collect(Collectors.toList());
- typeGoods = randomSelection(typeGoods, random1);
+ List<TGoods> typeGoodsList = goods.stream().filter(m -> e.getTypeId().equals(m.getTypeId())).collect(Collectors.toList());
+ List<TGoods> typeGoods = randomSelection(typeGoodsList, random1);
+ if(typeGoods.size() != random1){
+ List<TGoods> goods1 = randomSelection(typeGoodsList, random1 - typeGoods.size());
+ typeGoods.addAll(goods1);
+ }
for (TGoods typeGood : typeGoods) {
int count = 0;
for (TOrderMealGoods good : orderMealGoods) {
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; // 找到后直接跳出循环
}
}
@@ -471,7 +489,7 @@
return;
}
// 删除上一次的数据生成
- if(Objects.nonNull(orderStockLast)){
+ if(Objects.nonNull(orderStockLast) && Objects.nonNull(stockDataSet) && stockDataSets.size() > 1){
orderStockService.removeById(orderStockLast);
}
orderSaleService.saveBatch(orderSales);
@@ -529,7 +547,11 @@
// BigDecimal money = orderSaleGoods.stream().filter(e -> collect.contains(e.getOrderId()))
// .reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getGoodsCostPrice().multiply(new BigDecimal(y.getGoodsCount()))), BigDecimal::add);
if(!CollectionUtils.isEmpty(orderSales)){
- BigDecimal money = orderSales.stream().filter(e -> e.getGeneratorId().equals(tDataGeneratorVO.getId())).map(TOrderSale::getPayMoney).reduce(BigDecimal::add).get();
+ List<TOrderSale> collect = orderSales.stream().filter(e -> e.getGeneratorId().equals(tDataGeneratorVO.getId())).collect(Collectors.toList());
+ BigDecimal money = BigDecimal.ZERO;
+ if(!CollectionUtils.isEmpty(collect)){
+ money = collect.stream().map(TOrderSale::getPayMoney).reduce(BigDecimal::add).get();
+ }
tDataGeneratorVO.setTotalRevenue(money);
}
}
@@ -680,6 +702,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