From 7e0413895354b1a6a0e2d23eb7483a3713cd4b14 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 14 九月 2024 16:14:40 +0800
Subject: [PATCH] 修改接口
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java | 29 +++++++++++++++++++----------
1 files changed, 19 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 972dc79..19c1960 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
@@ -136,6 +136,7 @@
tOrderMealGoods.setGoodsSalePrice(typeGood.getSalePrice());
tOrderMealGoods.setGoodsCount(1);
tOrderMealGoods.setTypeId(typeGood.getTypeId());
+ tOrderMealGoods.setGoodsId(typeGood.getId());
orderMealGoods.add(tOrderMealGoods);
}
}
@@ -147,7 +148,7 @@
}
}
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());
@@ -293,6 +294,7 @@
tOrderStockGoods.setSalePrice(v.get(0).getGoodsSalePrice());
tOrderStockGoods.setThisSalePrice(v.get(0).getThisSalePrice());
tOrderStockGoods.setGoodsPicture(v.get(0).getGoodsPicture());
+ tOrderStockGoods.setGoodsId(v.get(0).getGoodsId());
tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());
orderStockGoods.add(tOrderStockGoods);
});
@@ -329,6 +331,7 @@
tOrderStockGoods.setSalePrice(v.get(0).getGoodsSalePrice());
tOrderStockGoods.setThisSalePrice(v.get(0).getThisSalePrice());
tOrderStockGoods.setGoodsPicture(v.get(0).getGoodsPicture());
+ tOrderStockGoods.setGoodsId(v.get(0).getGoodsId());
tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());
orderStockGoods.add(tOrderStockGoods);
});
@@ -358,6 +361,7 @@
tOrderStockGoods.setSalePrice(v.get(0).getGoodsSalePrice());
tOrderStockGoods.setThisSalePrice(v.get(0).getThisSalePrice());
tOrderStockGoods.setGoodsPicture(v.get(0).getGoodsPicture());
+ tOrderStockGoods.setGoodsId(v.get(0).getGoodsId());
tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());
orderStockGoods1.add(tOrderStockGoods);
});
@@ -387,6 +391,7 @@
tOrderStockGoods.setSalePrice(v.get(0).getGoodsSalePrice());
tOrderStockGoods.setThisSalePrice(v.get(0).getThisSalePrice());
tOrderStockGoods.setGoodsPicture(v.get(0).getGoodsPicture());
+ tOrderStockGoods.setGoodsId(v.get(0).getGoodsId());
tOrderStockGoods.setStockCount(v.stream().mapToInt(TOrderSaleGoods::getGoodsCount).sum());
orderStockGoods.add(tOrderStockGoods);
});
@@ -439,13 +444,15 @@
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);
+ tDataGeneratorVO.setTotalRevenue(money);
+ }
}
}else {
List<TOrderSale> orderSales = orderSaleService.list(Wrappers.lambdaQuery(TOrderSale.class)
@@ -457,8 +464,10 @@
// 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)){
+ BigDecimal money = orderSales.stream().map(TOrderSale::getPayMoney).reduce(BigDecimal::add).get();
+ tDataGeneratorVO.setTotalRevenue(money);
+ }
}
}
pageInfo.setRecords(list);
--
Gitblit v1.7.1