From abfedddb15ff90b7810a231dac964d2450372b94 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 10 九月 2024 09:01:42 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderSaleServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderSaleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderSaleServiceImpl.java
index 54de246..02b9936 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderSaleServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderSaleServiceImpl.java
@@ -7,6 +7,7 @@
import com.ruoyi.common.utils.CodeGenerateUtils;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.domain.*;
+import com.ruoyi.system.dto.CheckoutDTO;
import com.ruoyi.system.dto.TOrderSaleDTO;
import com.ruoyi.system.mapper.TOrderSaleMapper;
import com.ruoyi.system.query.TDataGeneratorSaleQuery;
@@ -50,14 +51,18 @@
// 查询菜品分类
List<TGoodsType> list1 = goodsTypeService.list();
// 销售单号
- dto.setOrderNum(OrderNumConstants.SALE + CodeGenerateUtils.generateOrderSn());
+ dto.setOrderNum(OrderNumConstants.SALE + CodeGenerateUtils.generateVolumeSn());
List<TOrderSaleGoods> orderSaleGoods = dto.getOrderSaleGoods();
BigDecimal sum = orderSaleGoods.stream().map(TOrderSaleGoods::getGoodsSalePrice).reduce(BigDecimal::add).get();
dto.setOrderMoney(sum);
- dto.setPayMoney(sum);
+ BigDecimal sum1 = orderSaleGoods.stream().map(TOrderSaleGoods::getThisSalePrice).reduce(BigDecimal::add).get();
+ dto.setPayMoney(sum1);
this.save(dto);
// 添加商品
- orderSaleGoods.forEach(orderSaleGoods1 -> orderSaleGoods1.setOrderId(dto.getId()));
+ orderSaleGoods.forEach(orderSaleGoods1 -> {
+ orderSaleGoods1.setOrderId(dto.getId());
+ orderSaleGoods1.setId(null);
+ });
orderSaleGoodsService.saveBatch(orderSaleGoods);
}
@@ -88,18 +93,23 @@
endTime = LocalDateTime.now();
break;
}
- query.setStartTime(startTime);
- query.setEndTime(endTime);
+ query.setStartTime(DateUtils.localDateTimeToDate(startTime));
+ query.setEndTime(DateUtils.localDateTimeToDate(endTime));
}
PageInfo<TOrderSaleVO> pageInfo = new PageInfo<>(query.getPageNum(),query.getPageSize());
List<TOrderSaleVO> list = this.baseMapper.pageList(query,pageInfo);
List<Long> ids = list.stream().map(TOrderSaleVO::getId).collect(Collectors.toList());
- List<TOrderSaleGoods> list1 = orderSaleGoodsService.list(Wrappers.lambdaQuery(TOrderSaleGoods.class)
- .in(TOrderSaleGoods::getOrderId, ids));
- list.forEach(e->{
- e.setGoodsAmount(list1.stream().filter(m->m.getOrderId().equals(e.getId())).map(TOrderSaleGoods::getGoodsSalePrice).reduce(BigDecimal::add).get());
- e.setOrderSaleGoods(list1.stream().filter(m->m.getOrderId().equals(e.getId())).collect(Collectors.toList()));
- });
+ if(!CollectionUtils.isEmpty(ids)){
+ List<TOrderSaleGoods> list1 = orderSaleGoodsService.list(Wrappers.lambdaQuery(TOrderSaleGoods.class)
+ .in(TOrderSaleGoods::getOrderId, ids));
+ list.forEach(e->{
+ List<TOrderSaleGoods> collect = list1.stream().filter(m -> m.getOrderId().equals(e.getId())).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(collect)){
+ e.setGoodsAmount(collect.stream().map(TOrderSaleGoods::getGoodsSalePrice).reduce(BigDecimal::add).get());
+ e.setOrderSaleGoods(collect);
+ }
+ });
+ }
pageInfo.setRecords(list);
return pageInfo;
}
@@ -130,16 +140,17 @@
public List<SalesRankingVO> salesRanking(TDataStatisticsQuery query) {
List<TOrderSale> list = this.list(Wrappers.lambdaQuery(TOrderSale.class)
.eq(TOrderSale::getShopId, query.getShopId())
- .between(TOrderSale::getCreateTime, query.getStartTime(), query.getEndTime()));
+ .between(TOrderSale::getOrderTime, query.getStartTime(), query.getEndTime()));
List<Long> ids = list.stream().map(TOrderSale::getId).collect(Collectors.toList());
List<SalesRankingVO> salesRankingVOS = new ArrayList<>();
if(!CollectionUtils.isEmpty(ids)){
List<TOrderSaleGoods> list1 = orderSaleGoodsService.list(Wrappers.lambdaQuery(TOrderSaleGoods.class)
.in(TOrderSaleGoods::getOrderId, ids));
- Map<String, List<TOrderSaleGoods>> listMap = list1.stream().collect(Collectors.groupingBy(TOrderSaleGoods::getTypeName));
+ Map<Long, List<TOrderSaleGoods>> listMap = list1.stream().collect(Collectors.groupingBy(TOrderSaleGoods::getTypeId));
+ List<TGoodsType> list2 = goodsTypeService.list();
listMap.forEach((k,v)->{
SalesRankingVO salesRankingVO = new SalesRankingVO();
- salesRankingVO.setTypeName(k);
+ salesRankingVO.setTypeName(list2.stream().filter(e->e.getId().equals(k)).findFirst().get().getTypeName());
salesRankingVO.setSalesVolume(v.stream().map(item->item.getGoodsSalePrice().multiply(new BigDecimal(item.getGoodsCount()))).reduce(BigDecimal.ZERO, BigDecimal::add));
salesRankingVOS.add(salesRankingVO);
});
@@ -174,8 +185,8 @@
endTime = LocalDateTime.now();
break;
}
- query.setStartTime(startTime);
- query.setEndTime(endTime);
+ query.setStartTime(DateUtils.localDateTimeToDate(startTime));
+ query.setEndTime(DateUtils.localDateTimeToDate(endTime));
}
List<TOrderSaleVO> list = this.baseMapper.exportOrderSale(query);
List<Long> ids = list.stream().map(TOrderSaleVO::getId).collect(Collectors.toList());
@@ -195,8 +206,8 @@
}
@Override
- public Map<String, BigDecimal> getDataGeneratorMealDetail(TDataGeneratorSaleQuery query) {
- return this.baseMapper.getDataGeneratorMealDetail(query);
+ public Map<String, Double> getDataGeneratorSaleDetail(TDataGeneratorSaleQuery query) {
+ return this.baseMapper.getDataGeneratorSaleDetail(query);
}
@Override
@@ -226,8 +237,8 @@
endTime = LocalDateTime.now();
break;
}
- query.setStartTime(startTime);
- query.setEndTime(endTime);
+ query.setStartTime(DateUtils.localDateTimeToDate(startTime));
+ query.setEndTime(DateUtils.localDateTimeToDate(endTime));
}
List<TOrderSaleVO> list = this.baseMapper.saleGeneratorExport(query);
List<Long> ids = list.stream().map(TOrderSaleVO::getId).collect(Collectors.toList());
@@ -240,4 +251,13 @@
}
return list;
}
+
+ @Override
+ public void checkout(CheckoutDTO dto) {
+ TOrderSale orderSale = this.getById(dto.getOrderId());
+ orderSale.setPayType(dto.getPayType());
+ orderSale.setPayMoney(dto.getPayMoney());
+ orderSale.setStatus(2);
+ this.updateById(orderSale);
+ }
}
--
Gitblit v1.7.1