From 3240f801b10a27fa660a4075f5538a0dfc69327c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 25 八月 2025 11:48:39 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 5e48780..8d0f842 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());
--
Gitblit v1.7.1