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 | 357 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 263 insertions(+), 94 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 e58f7b3..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
@@ -9,6 +9,7 @@
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.CodeGenerateUtils;
+import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.domain.*;
import com.ruoyi.system.dto.OrderMealGeneratorCountDTO;
import com.ruoyi.system.dto.OrderMealGeneratorDTO;
@@ -22,9 +23,12 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
@@ -45,6 +49,8 @@
@Autowired
private TFoundationConfigService foundationConfigService;
@Autowired
+ private TFoundationPersonService foundationPersonService;
+ @Autowired
private TGoodsService goodsService;
@Autowired
private TOrderMealService orderMealService;
@@ -63,6 +69,8 @@
@Autowired
private TGoodsTypeService goodsTypeService;
@Autowired
+ private TShopService shopService;
+ @Autowired
private RedisCache redisCache;
@Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
@@ -72,7 +80,7 @@
TDataGenerator dataGenerator = new TDataGenerator();
dataGenerator.setUserId(dto.getUserId());
dataGenerator.setUserName(dto.getNickName());
- dataGenerator.setShopId(dataGenerator.getShopId());
+ dataGenerator.setShopId(dto.getShopId());
dataGenerator.setStartTime(dto.getStartTime());
dataGenerator.setEndTime(dto.getEndTime());
dataGenerator.setMinMoney(dto.getMinMoney());
@@ -86,18 +94,35 @@
dataGenerator.setOtherPay(dto.getOtherProportion());
this.save(dataGenerator);
long start = System.currentTimeMillis();
- // 查询所有的人数用餐标准
- List<TFoundationConfigVO> foundationConfigs = foundationConfigService.getList();
+ TShop shop = shopService.getById(dto.getShopId());
+ List<TFoundationConfigVO> foundationConfigs = foundationConfigService.getList(shop.getMealType());
+ if(CollectionUtils.isEmpty(foundationConfigs)){
+ throw new ServiceException("请先添加中餐或火锅用餐标准");
+ }
// 查询所有桌子
- List<TBoard> boards = boardService.list();
+ List<TBoard> boards = boardService.list(Wrappers.lambdaQuery(TBoard.class)
+ .eq(TBoard::getShopId,dto.getShopId()));
+ if(CollectionUtils.isEmpty(boards)){
+ throw new ServiceException("请先添加该店铺桌台信息");
+ }
// 查询所有菜品
- List<TGoods> goods = goodsService.list();
+ List<TGoods> goods = goodsService.list(Wrappers.lambdaQuery(TGoods.class)
+ .eq(TGoods::getShopId,dto.getShopId()));
+ if(CollectionUtils.isEmpty(goods)){
+ throw new ServiceException("请先添加该店铺菜品信息");
+ }
// 循环待生成订单列表，添加到集合中，批量插入
List<OrderMealGeneratorCountDTO> orderMealGeneratorCountDTOS = dto.getOrderMealGeneratorCountDTOS();
List<TOrderMeal> orderMeals = new ArrayList<>();
for (OrderMealGeneratorCountDTO orderMealGeneratorCountDTO : orderMealGeneratorCountDTOS) {
- TBoard board = boards.stream().filter(e -> e.getId().equals(orderMealGeneratorCountDTO.getBoardId())).findFirst().get();
+ TBoard board = boards.stream().filter(e -> e.getId().equals(orderMealGeneratorCountDTO.getBoardId())).findFirst().orElse(null);
+ if(Objects.isNull(board)){
+ 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());
@@ -106,20 +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()));
break; // 找到后直接跳出循环
}
}
@@ -130,18 +171,22 @@
tOrderMealGoods.setGoodsPicture(typeGood.getGoodsPicture());
tOrderMealGoods.setGoodsSalePrice(typeGood.getSalePrice());
tOrderMealGoods.setGoodsCount(1);
+ tOrderMealGoods.setTypeId(typeGood.getTypeId());
+ tOrderMealGoods.setGoodsId(typeGood.getId());
orderMealGoods.add(tOrderMealGoods);
}
}
});
- orderMeal.setMealOrderGoods(orderMealGoods);
- orderMeal.setOrderMoney(orderMealGoods.stream().map(TOrderMealGoods::getGoodsSalePrice).reduce(BigDecimal::add).get());
- orderMeal.setPayMoney(orderMealGoods.stream().map(TOrderMealGoods::getGoodsSalePrice).reduce(BigDecimal::add).get());
- orderMeals.add(orderMeal);
+ if(!CollectionUtils.isEmpty(orderMealGoods)){
+ orderMeal.setMealOrderGoods(orderMealGoods);
+ orderMeal.setOrderMoney(orderMealGoods.stream().map(good->good.getGoodsSalePrice().multiply(new BigDecimal(good.getGoodsCount()))).reduce(BigDecimal::add).get());
+ orderMeal.setPayMoney(orderMealGoods.stream().map(good->good.getGoodsSalePrice().multiply(new BigDecimal(good.getGoodsCount()))).reduce(BigDecimal::add).get());
+ orderMeals.add(orderMeal);
+ }
}
}
BigDecimal sumMoney = orderMeals.stream().map(TOrderMeal::getPayMoney).reduce(BigDecimal::add).get();
- if(sumMoney.compareTo(dto.getMinMoney()) >= 0 || sumMoney.compareTo(dto.getMaxMoney()) <= 0){
+ if(sumMoney.compareTo(dto.getMinMoney()) >= 0 && sumMoney.compareTo(dto.getMaxMoney()) <= 0){
int weiXin = getRandomPayType(orderMeals.size(), dto.getWeiXinProportion());
int ali = getRandomPayType(orderMeals.size(), dto.getAliProportion());
int card = getRandomPayType(orderMeals.size(), dto.getCardProportion());
@@ -215,7 +260,25 @@
long end = System.currentTimeMillis() - start;
System.err.println("相差时间========="+end);
}else {
- throw new ServiceException("数据生成不在营业额范围内");
+ // 生成失败 进行重试
+ String key = dto.getShopId()+"_fail";
+ if(redisCache.hasKey(key)){
+ Object cacheObject = redisCache.getCacheObject(key);
+ int i = Integer.parseInt(cacheObject.toString());
+ if(i == 10){
+ this.removeById(dataGenerator);
+ redisCache.deleteObject(key);
+ throw new ServiceException("多次匹配数据不成功，请调整营业额范围");
+ }else {
+ this.removeById(dataGenerator);
+ redisCache.setCacheObject(key,i+1);
+ this.mealDataGenerator(dto);
+ }
+ }else {
+ this.removeById(dataGenerator);
+ redisCache.setCacheObject(key,1);
+ this.mealDataGenerator(dto);
+ }
}
}
@@ -255,9 +318,14 @@
orderSales.forEach(e->{
e.setGeneratorId(dataGenerator.getId());
e.setOrderNum(OrderNumConstants.SALE + CodeGenerateUtils.generateVolumeSn());
+ e.setIsCover(0);
+ e.setStatus(2);
});
List<TOrderSaleGoods> orderSaleGoods = orderSales.stream().map(TOrderSale::getOrderSaleGoods).flatMap(Collection::stream).collect(Collectors.toList());
-
+ TOrderStock orderStockLast = orderStockService.getOne(Wrappers.lambdaQuery(TOrderStock.class)
+ .eq(TOrderStock::getShopId, dto.getShopId())
+ .orderByDesc(TOrderStock::getStockTime)
+ .last("LIMIT 1"));
// 生成进货数据
List<TOrderStock> stockList = new ArrayList<>();
stockDataSets.stream().sorted(Comparator.comparing(TStockDataSet::getStockDate));
@@ -267,8 +335,9 @@
if(i==stockDataSets.size()-1){
// 最后一次
LocalDate endTime = LocalDate.now();
- List<Long> saleIds = orderSales.stream().filter(e -> e.getOrderTime().compareTo(startTime) >= 0 && e.getOrderTime().compareTo(endTime) <= 0).map(TOrderSale::getId).collect(Collectors.toList());
- List<TOrderSaleGoods> orderSaleGoodsList = orderSaleGoods.stream().filter(e -> saleIds.contains(e.getOrderId())).collect(Collectors.toList());
+ List<TOrderSale> collect = orderSales.stream().filter(e -> e.getOrderTime().compareTo(startTime) >= 0 && e.getOrderTime().compareTo(endTime) <= 0).collect(Collectors.toList());
+ List<TOrderSaleGoods> orderSaleGoodsList = new ArrayList<>();
+ collect.forEach(e->orderSaleGoodsList.addAll(e.getOrderSaleGoods()));
// 根据商品新生成一条数据
TOrderStock orderStock = new TOrderStock();
orderStock.setStockNum(OrderNumConstants.STOCK + CodeGenerateUtils.generateVolumeSn());
@@ -285,55 +354,77 @@
tOrderStockGoods.setGoodsNum(v.get(0).getGoodsNum());
tOrderStockGoods.setCostPrice(v.get(0).getGoodsCostPrice());
tOrderStockGoods.setSalePrice(v.get(0).getGoodsSalePrice());
- tOrderStockGoods.setThisSalePrice(v.get(0).getThisSalePrice());
+// tOrderStockGoods.setThisCostPrice(v.get(0).getThisSalePrice());
tOrderStockGoods.setGoodsPicture(v.get(0).getGoodsPicture());
- tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());
+ tOrderStockGoods.setGoodsId(v.get(0).getGoodsId());
+ int sum = v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum();
+ BigDecimal rate = new BigDecimal(100).subtract(start.getLossRate()).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
+ BigDecimal bigDecimal = new BigDecimal(sum).divide(rate,2,BigDecimal.ROUND_HALF_UP).setScale(0, BigDecimal.ROUND_HALF_UP);
+ tOrderStockGoods.setStockCount(Integer.parseInt(bigDecimal.toString().split("\\.")[0]));
orderStockGoods.add(tOrderStockGoods);
});
orderStock.setOrderStockGoods(orderStockGoods);
stockList.add(orderStock);
}else if(i==0 && Objects.nonNull(stockDataSet)){
- // 第一次 第一次的进货时间为上一次的结束时间 开始时间为上一次的开始时间
- LocalDate startTime1 = stockDataSet.getStockDate();
- List<Long> saleIds = orderSales.stream().filter(e -> e.getOrderTime().compareTo(startTime) < 0).map(TOrderSale::getId).collect(Collectors.toList());
- List<TOrderSaleGoods> orderSaleGoodsList = orderSaleGoods.stream().filter(e -> saleIds.contains(e.getOrderId())).collect(Collectors.toList());
- // 查询上一次开始之后的订单数据
- 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);
- // 删除上一次的数据生成 新生成一条数据
- TOrderStock orderStock = new TOrderStock();
- orderStock.setStockNum(OrderNumConstants.STOCK + CodeGenerateUtils.generateVolumeSn());
- orderStock.setStockTime(startTime);
- orderStock.setIsCover(0);
- orderStock.setGeneratorId(dataGenerator.getId());
- orderStock.setShopId(dto.getShopId());
+ if(Objects.nonNull(orderStockLast)){
+ // 查询商品进价
+ List<TOrderStockGoods> orderStockGoodsList = orderStockGoodsService.list(Wrappers.lambdaQuery(TOrderStockGoods.class).eq(TOrderStockGoods::getOrderId, orderStockLast.getId()));
+ // 第一次 第一次的进货时间为上一次的结束时间 开始时间为上一次的开始时间
+ LocalDate startTime1 = stockDataSet.getStockDate();
+ List<TOrderSale> collect = orderSales.stream().filter(e -> e.getOrderTime().compareTo(startTime) < 0).collect(Collectors.toList());
+ List<TOrderSaleGoods> orderSaleGoodsList = new ArrayList<>();
+ collect.forEach(e->orderSaleGoodsList.addAll(e.getOrderSaleGoods()));
+ // 查询上一次开始之后的订单数据
+ 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;
+ 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());
+ orderStock.setStockTime(orderStockLast.getStockTime());
+ orderStock.setIsCover(0);
+ orderStock.setGeneratorId(orderStockLast.getGeneratorId());
+ orderStock.setShopId(dto.getShopId());
- Map<String, List<TOrderSaleGoods>> goodsList = list.stream().collect(Collectors.groupingBy(TOrderSaleGoods::getGoodsName));
- List<TOrderStockGoods> orderStockGoods = new ArrayList<>();
- goodsList.forEach((k,v)->{
- TOrderStockGoods tOrderStockGoods = new TOrderStockGoods();
- tOrderStockGoods.setGoodsName(k);
- tOrderStockGoods.setGoodsNum(v.get(0).getGoodsNum());
- tOrderStockGoods.setCostPrice(v.get(0).getGoodsCostPrice());
- tOrderStockGoods.setSalePrice(v.get(0).getGoodsSalePrice());
- tOrderStockGoods.setThisSalePrice(v.get(0).getThisSalePrice());
- tOrderStockGoods.setGoodsPicture(v.get(0).getGoodsPicture());
- tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());
- orderStockGoods.add(tOrderStockGoods);
- });
- orderStock.setOrderStockGoods(orderStockGoods);
- stockList.add(orderStock);
+ Map<String, List<TOrderSaleGoods>> goodsList = list.stream().collect(Collectors.groupingBy(TOrderSaleGoods::getGoodsName));
+ List<TOrderStockGoods> orderStockGoods = new ArrayList<>();
+ goodsList.forEach((k,v)->{
+ TOrderStockGoods tOrderStockGoods = new TOrderStockGoods();
+ tOrderStockGoods.setGoodsName(k);
+ tOrderStockGoods.setGoodsNum(v.get(0).getGoodsNum());
+ tOrderStockGoods.setCostPrice(v.get(0).getGoodsCostPrice());
+ tOrderStockGoods.setSalePrice(v.get(0).getGoodsSalePrice());
+ TOrderStockGoods orderStockGoods1 = orderStockGoodsList.stream().filter(e -> e.getGoodsName().equals(k)).findFirst().orElse(null);
+ if(Objects.nonNull(orderStockGoods1)){
+ tOrderStockGoods.setThisCostPrice(orderStockGoods1.getThisCostPrice());
+ }
+ tOrderStockGoods.setGoodsPicture(v.get(0).getGoodsPicture());
+ tOrderStockGoods.setGoodsId(v.get(0).getGoodsId());
+ int sum = v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum();
+ BigDecimal rate = new BigDecimal(100).subtract(start.getLossRate()).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
+ BigDecimal bigDecimal = new BigDecimal(sum).divide(rate,2,BigDecimal.ROUND_HALF_UP).setScale(0, BigDecimal.ROUND_HALF_UP);
+ tOrderStockGoods.setStockCount(Integer.parseInt(bigDecimal.toString().split("\\.")[0]));
+ orderStockGoods.add(tOrderStockGoods);
+ });
+ orderStock.setOrderStockGoods(orderStockGoods);
+ stockList.add(orderStock);
+ }
// 处理第一次到下一次的数据
TStockDataSet end = stockDataSets.get(i + 1);
LocalDate endTime = end.getStockDate();
- List<Long> saleIds2 = orderSales.stream().filter(e -> e.getOrderTime().compareTo(startTime) >= 0 && e.getOrderTime().compareTo(endTime) < 0).map(TOrderSale::getId).collect(Collectors.toList());
- List<TOrderSaleGoods> orderSaleGoodsList2 = orderSaleGoods.stream().filter(e -> saleIds2.contains(e.getOrderId())).collect(Collectors.toList());
+ List<TOrderSale> collect1 = orderSales.stream().filter(e -> e.getOrderTime().compareTo(startTime) >= 0 && e.getOrderTime().compareTo(endTime) < 0).collect(Collectors.toList());
+ List<TOrderSaleGoods> orderSaleGoodsList2 = new ArrayList<>();
+ collect1.forEach(e->orderSaleGoodsList2.addAll(e.getOrderSaleGoods()));
// 根据商品新生成一条数据
TOrderStock orderStock1 = new TOrderStock();
orderStock1.setStockNum(OrderNumConstants.STOCK + CodeGenerateUtils.generateVolumeSn());
@@ -350,9 +441,13 @@
tOrderStockGoods.setGoodsNum(v.get(0).getGoodsNum());
tOrderStockGoods.setCostPrice(v.get(0).getGoodsCostPrice());
tOrderStockGoods.setSalePrice(v.get(0).getGoodsSalePrice());
- tOrderStockGoods.setThisSalePrice(v.get(0).getThisSalePrice());
+// tOrderStockGoods.setThisCostPrice(v.get(0).getThisSalePrice());
tOrderStockGoods.setGoodsPicture(v.get(0).getGoodsPicture());
- tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());
+ tOrderStockGoods.setGoodsId(v.get(0).getGoodsId());
+ int sum = v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum();
+ BigDecimal rate = new BigDecimal(100).subtract(start.getLossRate()).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
+ BigDecimal bigDecimal = new BigDecimal(sum).divide(rate,2,BigDecimal.ROUND_HALF_UP).setScale(0, BigDecimal.ROUND_HALF_UP);
+ tOrderStockGoods.setStockCount(Integer.parseInt(bigDecimal.toString().split("\\.")[0]));
orderStockGoods1.add(tOrderStockGoods);
});
orderStock1.setOrderStockGoods(orderStockGoods1);
@@ -361,8 +456,9 @@
}else {
TStockDataSet end = stockDataSets.get(i + 1);
LocalDate endTime = end.getStockDate();
- List<Long> saleIds = orderSales.stream().filter(e -> e.getOrderTime().compareTo(startTime) >= 0 && e.getOrderTime().compareTo(endTime) < 0).map(TOrderSale::getId).collect(Collectors.toList());
- List<TOrderSaleGoods> orderSaleGoodsList = orderSaleGoods.stream().filter(e -> saleIds.contains(e.getOrderId())).collect(Collectors.toList());
+ List<TOrderSale> collect = orderSales.stream().filter(e -> e.getOrderTime().compareTo(startTime) >= 0 && e.getOrderTime().compareTo(endTime) < 0).collect(Collectors.toList());
+ List<TOrderSaleGoods> orderSaleGoodsList = new ArrayList<>();
+ collect.forEach(e->orderSaleGoodsList.addAll(e.getOrderSaleGoods()));
// 根据商品新生成一条数据
TOrderStock orderStock = new TOrderStock();
orderStock.setStockNum(OrderNumConstants.STOCK + CodeGenerateUtils.generateVolumeSn());
@@ -379,9 +475,13 @@
tOrderStockGoods.setGoodsNum(v.get(0).getGoodsNum());
tOrderStockGoods.setCostPrice(v.get(0).getGoodsCostPrice());
tOrderStockGoods.setSalePrice(v.get(0).getGoodsSalePrice());
- tOrderStockGoods.setThisSalePrice(v.get(0).getThisSalePrice());
+// tOrderStockGoods.setThisCostPrice(v.get(0).getThisSalePrice());
tOrderStockGoods.setGoodsPicture(v.get(0).getGoodsPicture());
- tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());
+ tOrderStockGoods.setGoodsId(v.get(0).getGoodsId());
+ int sum = v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum();
+ BigDecimal rate = new BigDecimal(100).subtract(start.getLossRate()).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
+ BigDecimal bigDecimal = new BigDecimal(sum).divide(rate,2,BigDecimal.ROUND_HALF_UP).setScale(0, BigDecimal.ROUND_HALF_UP);
+ tOrderStockGoods.setStockCount(Integer.parseInt(bigDecimal.toString().split("\\.")[0]));
orderStockGoods.add(tOrderStockGoods);
});
orderStock.setOrderStockGoods(orderStockGoods);
@@ -394,12 +494,8 @@
return;
}
// 删除上一次的数据生成
- TOrderStock orderStock = orderStockService.getOne(Wrappers.lambdaQuery(TOrderStock.class)
- .eq(TOrderStock::getShopId, dto.getShopId())
- .orderByDesc(TOrderStock::getStockTime)
- .last("LIMIT 1"));
- if(Objects.nonNull(orderStock)){
- orderStockService.removeById(orderStock);
+ if(Objects.nonNull(orderStockLast) && Objects.nonNull(stockDataSet) && stockDataSets.size() > 1){
+ orderStockService.removeById(orderStockLast);
}
orderSaleService.saveBatch(orderSales);
for (TOrderSale orderSale : orderSales) {
@@ -409,10 +505,10 @@
// orderSaleGoods.forEach(e->e.setTypeName(list.stream().filter(m->m.getId().equals(e.getTypeId())).findFirst().get().getTypeName()));
orderSaleGoods.forEach(e->{
e.setId(null);
+ e.setGoodsCostPrice(null);
});
orderSaleGoodsService.saveBatch(orderSaleGoods);
// 添加数据
- stockList.forEach(e->e.setShopId(dataGenerator.getShopId()));
orderStockService.saveBatch(stockList);
for (TOrderStock stock : stockList) {
stock.getOrderStockGoods().forEach(e->e.setOrderId(stock.getId()));
@@ -426,17 +522,24 @@
PageInfo<TDataGeneratorVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TDataGeneratorVO> list = this.baseMapper.pageList(query,pageInfo);
List<Long> ids = list.stream().map(TDataGeneratorVO::getId).collect(Collectors.toList());
+ if(CollectionUtils.isEmpty(ids)){
+ return new PageInfo<>();
+ }
if(query.getOrderType() == 1){
List<TOrderMeal> orderMeals = orderMealService.list(Wrappers.lambdaQuery(TOrderMeal.class)
.in(TOrderMeal::getGeneratorId, ids));
List<Long> mealIds = orderMeals.stream().map(TOrderMeal::getId).collect(Collectors.toList());
- List<TOrderMealGoods> mealGoods = orderMealGoodsService.list(Wrappers.lambdaQuery(TOrderMealGoods.class)
- .in(TOrderMealGoods::getOrderId, mealIds));
- for (TDataGeneratorVO tDataGeneratorVO : list) {
- List<Long> collect = orderMeals.stream().filter(e -> e.getGeneratorId().equals(tDataGeneratorVO.getId())).map(TOrderMeal::getId).collect(Collectors.toList());
- BigDecimal money = mealGoods.stream().filter(e -> collect.contains(e.getOrderId()))
- .reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getGoodsSalePrice().multiply(new BigDecimal(y.getGoodsCount()))), BigDecimal::add);
- tDataGeneratorVO.setTotalRevenue(money);
+ if(!CollectionUtils.isEmpty(mealIds)){
+// List<TOrderMealGoods> mealGoods = orderMealGoodsService.list(Wrappers.lambdaQuery(TOrderMealGoods.class)
+// .in(TOrderMealGoods::getOrderId, mealIds));
+ for (TDataGeneratorVO tDataGeneratorVO : list) {
+// List<Long> collect = orderMeals.stream().filter(e -> e.getGeneratorId().equals(tDataGeneratorVO.getId())).map(TOrderMeal::getId).collect(Collectors.toList());
+// BigDecimal money = mealGoods.stream().filter(e -> collect.contains(e.getOrderId()))
+// .reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getGoodsSalePrice().multiply(new BigDecimal(y.getGoodsCount()))), BigDecimal::add);
+ BigDecimal money = orderMeals.stream().filter(e -> e.getGeneratorId().equals(tDataGeneratorVO.getId()))
+ .map(TOrderMeal::getPayMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+ tDataGeneratorVO.setTotalRevenue(money);
+ }
}
}else {
List<TOrderSale> orderSales = orderSaleService.list(Wrappers.lambdaQuery(TOrderSale.class)
@@ -448,8 +551,14 @@
// List<Long> collect = orderSales.stream().filter(e -> e.getGeneratorId().equals(tDataGeneratorVO.getId())).map(TOrderSale::getId).collect(Collectors.toList());
// 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);
- BigDecimal money = orderSales.stream().map(TOrderSale::getPayMoney).reduce(BigDecimal::add).get();
- tDataGeneratorVO.setTotalRevenue(money);
+ if(!CollectionUtils.isEmpty(orderSales)){
+ 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);
+ }
}
}
pageInfo.setRecords(list);
@@ -463,14 +572,42 @@
if(dataGenerator.getOrderType() == 1){
// 删除时间段的数据
orderMealService.remove(Wrappers.lambdaQuery(TOrderMeal.class)
- .gt(TOrderMeal::getCreateTime, dataGenerator.getStartTime())
- .lt(TOrderMeal::getCreateTime, dataGenerator.getEndTime()));
+ .ge(TOrderMeal::getMealTime, dataGenerator.getStartTime())
+ .le(TOrderMeal::getMealTime, dataGenerator.getEndTime())
+ .eq(TOrderMeal::getIsCover,1));
// 修改覆盖类型为已覆盖
orderMealService.update(Wrappers.lambdaUpdate(TOrderMeal.class).set(TOrderMeal::getIsCover, 1).eq(TOrderMeal::getGeneratorId, id));
}else {
+ List<TOrderStock> list = orderStockService.list(Wrappers.lambdaQuery(TOrderStock.class)
+ .eq(TOrderStock::getGeneratorId, id));
+ List<Long> stockIds = list.stream().map(TOrderStock::getId).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(stockIds)){
+ List<TOrderStockGoods> list1 = orderStockGoodsService.list(Wrappers.lambdaQuery(TOrderStockGoods.class)
+ .in(TOrderStockGoods::getOrderId, stockIds));
+ // 判断集合中的进价是否为0
+ for (TOrderStockGoods tOrderStockGoods : list1) {
+ if(tOrderStockGoods.getThisCostPrice().compareTo(BigDecimal.ZERO) == 0){
+ throw new ServiceException("进价不能为0");
+ }
+ }
+ }
+ // 删除时间段的数据
+ orderSaleService.remove(Wrappers.lambdaQuery(TOrderSale.class)
+ .ge(TOrderSale::getOrderTime, dataGenerator.getStartTime())
+ .le(TOrderSale::getOrderTime, dataGenerator.getEndTime())
+ .eq(TOrderSale::getIsCover,1));
+ // 修改覆盖类型为已覆盖
+ orderSaleService.update(Wrappers.lambdaUpdate(TOrderSale.class).set(TOrderSale::getIsCover, 1).eq(TOrderSale::getGeneratorId, id));
+ // 删除时间段的数据
+ orderStockService.remove(Wrappers.lambdaQuery(TOrderStock.class)
+ .ge(TOrderStock::getStockTime, dataGenerator.getStartTime())
+ .le(TOrderStock::getStockTime, dataGenerator.getEndTime())
+ .eq(TOrderStock::getIsCover,1));
// 修改覆盖类型为已覆盖
orderStockService.update(Wrappers.lambdaUpdate(TOrderStock.class).set(TOrderStock::getIsCover, 1).eq(TOrderStock::getGeneratorId, id));
}
+ dataGenerator.setStatus(3);
+ this.updateById(dataGenerator);
}
@Override
@@ -479,16 +616,21 @@
TDataGenerator dataGenerator = this.getById(query.getGeneratorId());
TDataGeneratorMealDetailVO data = new TDataGeneratorMealDetailVO();
BeanUtils.copyProperties(dataGenerator,data);
+ // 查询店铺
+ TShop shop = shopService.getById(dataGenerator.getShopId());
+ if(Objects.nonNull(shop)){
+ data.setShopName(shop.getShopName());
+ }
// 查询订单
PageInfo<TOrderMealVO> pageInfo = orderMealService.pageListGenerator(query);
data.setOrderMealList(pageInfo);
// 统计支付金额
- Map<String, BigDecimal> map = orderMealService.getDataGeneratorMealDetail(query);
- BigDecimal money = map.get("moneyPay");
- BigDecimal card = map.get("cardPay");
- BigDecimal weiXin = map.get("weiXinPay");
- BigDecimal ali = map.get("aliPay");
- BigDecimal other = map.get("otherPay");
+ Map<String, Double> map = orderMealService.getDataGeneratorMealDetail(query);
+ BigDecimal money = new BigDecimal(map.get("moneyPay")).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal card = new BigDecimal(map.get("cardPay")).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal weiXin = new BigDecimal(map.get("weiXinPay")).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal ali = new BigDecimal(map.get("aliPay")).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal other = new BigDecimal(map.get("otherPay")).setScale(2,BigDecimal.ROUND_HALF_UP);
data.setMoneyPayAmount(money);
data.setCardPayAmount(card);
data.setWeiXinPayAmount(weiXin);
@@ -507,15 +649,23 @@
orderSaleQuery.setPayType(query.getPayType());
orderSaleQuery.setOrderNum(query.getOrderNum());
orderSaleQuery.setGeneratorId(query.getGeneratorId());
+ try {
+ if (Objects.nonNull(query.getStartTime()) && Objects.nonNull(query.getEndTime())){
+ orderSaleQuery.setStartTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(query.getStartTime()));
+ orderSaleQuery.setEndTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(query.getEndTime()));
+ }
+ } catch (ParseException e) {
+ throw new ServiceException(e.getMessage());
+ }
PageInfo<TOrderSaleVO> pageInfo = orderSaleService.pageList(orderSaleQuery);
data.setOrderMealList(pageInfo);
// 统计支付金额
- Map<String, BigDecimal> map = orderSaleService.getDataGeneratorMealDetail(query);
- BigDecimal money = map.get("moneyPay");
- BigDecimal card = map.get("cardPay");
- BigDecimal weiXin = map.get("weiXinPay");
- BigDecimal ali = map.get("aliPay");
- BigDecimal other = map.get("otherPay");
+ Map<String, Double> map = orderSaleService.getDataGeneratorSaleDetail(query);
+ BigDecimal money = new BigDecimal(map.get("moneyPay")).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal card = new BigDecimal(map.get("cardPay")).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal weiXin = new BigDecimal(map.get("weiXinPay")).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal ali = new BigDecimal(map.get("aliPay")).setScale(2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal other = new BigDecimal(map.get("otherPay")).setScale(2,BigDecimal.ROUND_HALF_UP);
data.setMoneyPayAmount(money);
data.setCardPayAmount(card);
data.setWeiXinPayAmount(weiXin);
@@ -533,14 +683,28 @@
orderStockQuery.setGeneratorId(query.getGeneratorId());
orderStockQuery.setTimeType(query.getTimeType());
orderStockQuery.setStockNum(query.getOrderNum());
+ try {
+ if(Objects.nonNull(query.getStartTime()) && Objects.nonNull(query.getEndTime())){
+ orderStockQuery.setStartTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(query.getStartTime()));
+ orderStockQuery.setEndTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(query.getEndTime()));
+ }
+ } catch (ParseException e) {
+ throw new ServiceException(e.getMessage());
+ }
PageInfo<TOrderStockVO> pageInfo = orderStockService.pageList(orderStockQuery);
data.setOrderStockVOList(pageInfo);
// 统计支付金额
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;
}
@@ -549,8 +713,13 @@
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, RoundingMode.HALF_UP);
+ 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