From 13a3236249d21e1ed1a0f1e8ae20a29d6bf3913a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 26 九月 2025 17:49:11 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 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 8ae3c29..b5428c7 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
@@ -170,6 +170,7 @@
tOrderMealGoods.setGoodsName(typeGood.getGoodsName());
tOrderMealGoods.setGoodsPicture(typeGood.getGoodsPicture());
tOrderMealGoods.setGoodsSalePrice(typeGood.getSalePrice());
+ tOrderMealGoods.setCostPrice(typeGood.getCostPrice());
tOrderMealGoods.setGoodsCount(1);
tOrderMealGoods.setTypeId(typeGood.getTypeId());
tOrderMealGoods.setGoodsId(typeGood.getId());
@@ -378,10 +379,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());
@@ -496,7 +502,10 @@
for (TOrderSale orderSale : orderSales) {
orderSale.getOrderSaleGoods().forEach(e->e.setOrderId(orderSale.getId()));
}
- List<TGoodsType> list = goodsTypeService.list();
+ // 查询店铺下的商品
+ List<TGoods> goodsList = goodsService.list(Wrappers.lambdaQuery(TGoods.class)
+ .in(TGoods::getShopId,dto.getShopId()));
+// List<TGoodsType> list = goodsTypeService.list();
// orderSaleGoods.forEach(e->e.setTypeName(list.stream().filter(m->m.getId().equals(e.getTypeId())).findFirst().get().getTypeName()));
orderSaleGoods.forEach(e->{
e.setId(null);
@@ -509,6 +518,12 @@
stock.getOrderStockGoods().forEach(e->e.setOrderId(stock.getId()));
}
List<TOrderStockGoods> orderStockGoods = stockList.stream().map(TOrderStock::getOrderStockGoods).flatMap(Collection::stream).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(orderStockGoods)){
+ for (TOrderStockGoods orderStockGood : orderStockGoods) {
+ goodsList.stream().filter(e->e.getId().equals(orderStockGood.getGoodsId()))
+ .findFirst().ifPresent(e->orderStockGood.setThisCostPrice(e.getCostPrice()));
+ }
+ }
orderStockGoodsService.saveBatch(orderStockGoods);
}
@@ -569,6 +584,7 @@
orderMealService.remove(Wrappers.lambdaQuery(TOrderMeal.class)
.ge(TOrderMeal::getMealTime, dataGenerator.getStartTime())
.le(TOrderMeal::getMealTime, dataGenerator.getEndTime())
+ .eq(TOrderMeal::getShopId, dataGenerator.getShopId())
.eq(TOrderMeal::getIsCover,1));
// 修改覆盖类型为已覆盖
orderMealService.update(Wrappers.lambdaUpdate(TOrderMeal.class).set(TOrderMeal::getIsCover, 1).eq(TOrderMeal::getGeneratorId, id));
@@ -590,6 +606,7 @@
orderSaleService.remove(Wrappers.lambdaQuery(TOrderSale.class)
.ge(TOrderSale::getOrderTime, dataGenerator.getStartTime())
.le(TOrderSale::getOrderTime, dataGenerator.getEndTime())
+ .eq(TOrderSale::getShopId, dataGenerator.getShopId())
.eq(TOrderSale::getIsCover,1));
// 修改覆盖类型为已覆盖
orderSaleService.update(Wrappers.lambdaUpdate(TOrderSale.class).set(TOrderSale::getIsCover, 1).eq(TOrderSale::getGeneratorId, id));
@@ -597,6 +614,7 @@
orderStockService.remove(Wrappers.lambdaQuery(TOrderStock.class)
.ge(TOrderStock::getStockTime, dataGenerator.getStartTime())
.le(TOrderStock::getStockTime, dataGenerator.getEndTime())
+ .eq(TOrderStock::getShopId, dataGenerator.getShopId())
.eq(TOrderStock::getIsCover,1));
// 修改覆盖类型为已覆盖
orderStockService.update(Wrappers.lambdaUpdate(TOrderStock.class).set(TOrderStock::getIsCover, 1).eq(TOrderStock::getGeneratorId, id));
@@ -698,7 +716,7 @@
if(CollectionUtils.isEmpty(list)){
data.setStockAmountSum(BigDecimal.ZERO);
}else {
- data.setStockAmountSum(list.stream().map(TOrderStock::getStockTotalPrice).reduce(BigDecimal.ZERO, BigDecimal::add));
+ data.setStockAmountSum(list.stream().filter(e->Objects.nonNull(e.getStockTotalPrice())).map(TOrderStock::getStockTotalPrice).reduce(BigDecimal.ZERO, BigDecimal::add));
}
return data;
}
--
Gitblit v1.7.1