From b68348c51d17bee1952a2316d37da7775dac2dd8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 13 九月 2024 11:28:39 +0800
Subject: [PATCH] 修改接口
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java | 56 +++++++++++++++++++++++++++-----------------------------
1 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java
index af90473..53d11ed 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java
@@ -38,6 +38,8 @@
@Autowired
private TOrderMealGoodsService orderMealGoodsService;
@Autowired
+ private TOrderMealGoodsMapper orderMealGoodsMapper;
+ @Autowired
private TOrderRemarkService orderRemarkService;
@Autowired
private TBoardService boardService;
@@ -80,8 +82,8 @@
orderMealGood.setGoodsNum(item1.getGoodsNum());
orderMealGood.setGoodsPicture(item1.getGoodsPicture());
orderMealGood.setGoodsCount(item.getGoodsCount());
- orderMealGood.setGoodsSalePrice(item1.getSalePrice().multiply(new BigDecimal(item.getGoodsCount())));
- orderMealGood.setCostPrice(item1.getCostPrice().multiply(new BigDecimal(item.getGoodsCount())));
+ orderMealGood.setGoodsSalePrice(item1.getSalePrice());
+ orderMealGood.setCostPrice(item1.getCostPrice());
orderMealGood.setTypeId(item1.getTypeId());
orderMealGood.setGoodsId(item1.getId());
orderMealGood.setTypeName(list1.stream().filter(item2 -> item2.getId().equals(item1.getTypeId())).findFirst().get().getTypeName());
@@ -92,7 +94,7 @@
// 添加菜品
for (TOrderMealGoods orderMealGood : orderMealGoods) {
orderMealGood.setOrderId(dto.getId());
- orderMoney = orderMoney.add(orderMealGood.getGoodsSalePrice());
+ orderMoney = orderMoney.add(orderMealGood.getGoodsSalePrice().multiply(new BigDecimal(orderMealGood.getGoodsCount())));
}
orderMealGoodsService.saveBatch(orderMealGoods);
orderMeal.setOrderMoney(orderMoney);
@@ -228,24 +230,18 @@
}
@Override
- public List<SalesRankingVO> salesRanking(TDataStatisticsQuery query) {
+ public PageInfo<SalesRankingVO> salesRanking(TDataStatisticsQuery query) {
+ PageInfo<SalesRankingVO> pageInfo = new PageInfo<>(query.getPageNum(),query.getPageSize());
List<TOrderMeal> list = this.list(Wrappers.lambdaQuery(TOrderMeal.class)
.eq(TOrderMeal::getShopId, query.getShopId())
.between(TOrderMeal::getCreateTime, query.getStartTime(), query.getEndTime()));
List<Long> ids = list.stream().map(TOrderMeal::getId).collect(Collectors.toList());
- List<SalesRankingVO> salesRankingVOS = new ArrayList<>();
- if(!CollectionUtils.isEmpty(ids)){
- List<TOrderMealGoods> list1 = orderMealGoodsService.list(Wrappers.lambdaQuery(TOrderMealGoods.class)
- .in(TOrderMealGoods::getOrderId, ids));
- Map<String, List<TOrderMealGoods>> listMap = list1.stream().collect(Collectors.groupingBy(TOrderMealGoods::getTypeName));
- listMap.forEach((k,v)->{
- SalesRankingVO salesRankingVO = new SalesRankingVO();
- salesRankingVO.setTypeName(k);
- salesRankingVO.setSalesVolume(v.stream().map(item->item.getGoodsSalePrice().multiply(new BigDecimal(item.getGoodsCount()))).reduce(BigDecimal.ZERO, BigDecimal::add));
- salesRankingVOS.add(salesRankingVO);
- });
+ if(CollectionUtils.isEmpty(ids)){
+ return new PageInfo<>();
}
- return salesRankingVOS;
+ List<SalesRankingVO> salesRankingVOS = orderMealGoodsMapper.salesRanking(ids, pageInfo);
+ pageInfo.setRecords(salesRankingVOS);
+ return pageInfo;
}
@Override
@@ -280,18 +276,20 @@
}
List<TOrderMealVO> list = this.baseMapper.exportOrderMeal(query);
List<Long> ids = list.stream().map(TOrderMealVO::getId).collect(Collectors.toList());
- List<TOrderMealGoods> list1 = orderMealGoodsService.list(Wrappers.lambdaQuery(TOrderMealGoods.class)
- .in(TOrderMealGoods::getOrderId,ids));
- // 查询商品信息
- for (TOrderMealVO tOrderMealVO : list) {
- List<TOrderMealGoods> collect = list1.stream().filter(e -> e.getOrderId().equals(tOrderMealVO.getId())).collect(Collectors.toList());
- tOrderMealVO.setOrderMealGoods(collect);
- Map<String, List<TOrderMealGoods>> map = collect.stream().collect(Collectors.groupingBy(TOrderMealGoods::getTypeName));
- List<String> goodsList = new ArrayList<>();
- map.forEach((k,v)->{
- goodsList.add(k+":"+v.stream().map(item->item.getGoodsName()+" "+(item.getGoodsSalePrice().multiply(new BigDecimal(item.getGoodsCount())))).collect(Collectors.joining(",")));
- });
- tOrderMealVO.setGoodsList(goodsList);
+ if(!CollectionUtils.isEmpty(ids)){
+ List<TOrderMealGoods> list1 = orderMealGoodsService.list(Wrappers.lambdaQuery(TOrderMealGoods.class)
+ .in(TOrderMealGoods::getOrderId,ids));
+ // 查询商品信息
+ for (TOrderMealVO tOrderMealVO : list) {
+ List<TOrderMealGoods> collect = list1.stream().filter(e -> e.getOrderId().equals(tOrderMealVO.getId())).collect(Collectors.toList());
+ tOrderMealVO.setOrderMealGoods(collect);
+ Map<String, List<TOrderMealGoods>> map = collect.stream().collect(Collectors.groupingBy(TOrderMealGoods::getTypeName));
+ List<String> goodsList = new ArrayList<>();
+ map.forEach((k,v)->{
+ goodsList.add(k+":"+v.stream().map(item->item.getGoodsName()+" "+(item.getGoodsSalePrice().multiply(new BigDecimal(item.getGoodsCount())))).collect(Collectors.joining(",")));
+ });
+ tOrderMealVO.setGoodsList(goodsList);
+ }
}
return list;
}
@@ -397,7 +395,7 @@
profitDetailsVO.setGoodsProfitVOS(pageInfo);
// 统计商品金额
- Map<String,BigDecimal> map = this.baseMapper.profitDetailsStatistics(query);
+ Map<String,Double> map = this.baseMapper.profitDetailsStatistics(query);
profitDetailsVO.setTotalProfits(new BigDecimal(map.get("totalProfits").toString()));
profitDetailsVO.setTotalCosts(new BigDecimal(map.get("totalCosts").toString()));
profitDetailsVO.setTotalSales(new BigDecimal(map.get("totalSales").toString()));
--
Gitblit v1.7.1