From 76699e910ca78a400c0bcdbaa7c175248f9589d0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 26 九月 2024 18:28:56 +0800
Subject: [PATCH] 修改接口
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderSaleServiceImpl.java | 325 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 233 insertions(+), 92 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 6285a20..afe7743 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
@@ -6,18 +6,14 @@
import com.ruoyi.common.constant.OrderNumConstants;
import com.ruoyi.common.utils.CodeGenerateUtils;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.*;
import com.ruoyi.system.dto.CheckoutDTO;
import com.ruoyi.system.dto.TOrderSaleDTO;
+import com.ruoyi.system.mapper.TOrderSaleGoodsMapper;
import com.ruoyi.system.mapper.TOrderSaleMapper;
-import com.ruoyi.system.query.TDataGeneratorSaleQuery;
-import com.ruoyi.system.query.TDataStatisticsQuery;
-import com.ruoyi.system.query.TOrderMealQuery;
-import com.ruoyi.system.query.TOrderSaleQuery;
-import com.ruoyi.system.service.TGoodsService;
-import com.ruoyi.system.service.TGoodsTypeService;
-import com.ruoyi.system.service.TOrderSaleGoodsService;
-import com.ruoyi.system.service.TOrderSaleService;
+import com.ruoyi.system.query.*;
+import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -46,58 +42,71 @@
@Autowired
private TOrderSaleGoodsService orderSaleGoodsService;
@Autowired
- private TGoodsTypeService goodsTypeService;
+ private TOrderStockGoodsService orderStockGoodsService;
@Autowired
- private TGoodsService goodsService;
+ private TOrderSaleGoodsMapper orderSaleGoodsMapper;
@Override
public void add(TOrderSaleDTO dto) {
// 查询菜品分类
- List<TGoodsType> list1 = goodsTypeService.list();
+// List<TGoodsType> list1 = goodsTypeService.list();
// 销售单号
dto.setOrderNum(OrderNumConstants.SALE + CodeGenerateUtils.generateVolumeSn());
List<TOrderSaleGoods> orderSaleGoods = dto.getOrderSaleGoods();
- BigDecimal sum = orderSaleGoods.stream().map(TOrderSaleGoods::getGoodsSalePrice).reduce(BigDecimal::add).get();
+ BigDecimal sum = BigDecimal.ZERO;
+ for (TOrderSaleGoods orderSaleGood : orderSaleGoods) {
+ sum = sum.add(orderSaleGood.getThisSalePrice().multiply(new BigDecimal(orderSaleGood.getGoodsCount())));
+ }
dto.setOrderMoney(sum);
- BigDecimal sum1 = orderSaleGoods.stream().map(TOrderSaleGoods::getThisSalePrice).reduce(BigDecimal::add).get();
- dto.setPayMoney(sum1);
this.save(dto);
+
+ // 查询进货数据
+ List<TOrderStockGoods> orderStockGoodsList = orderStockGoodsService.getListByTimeAndShopId(DateUtils.localDateToString(dto.getOrderTime()), dto.getShopId());
+
// 添加商品
orderSaleGoods.forEach(orderSaleGoods1 -> {
orderSaleGoods1.setOrderId(dto.getId());
orderSaleGoods1.setId(null);
+ TOrderStockGoods orderStockGoods = orderStockGoodsList.stream().filter(m -> m.getGoodsNum().equals(orderSaleGoods1.getGoodsNum())).findFirst().orElse(null);
+ if(Objects.nonNull(orderStockGoods)){
+ orderSaleGoods1.setGoodsCostPrice(orderStockGoods.getThisCostPrice());
+ }else {
+ orderSaleGoods1.setGoodsCostPrice(BigDecimal.ZERO);
+ }
});
orderSaleGoodsService.saveBatch(orderSaleGoods);
}
@Override
public PageInfo<TOrderSaleVO> pageList(TOrderSaleQuery query) {
- if(Objects.nonNull(query.getTimeType())){
- LocalDateTime startTime = null;
- LocalDateTime endTime = null;
- switch (query.getTimeType()){
- case 1:
- // 今日
- startTime = LocalDateTime.MIN;
- endTime = LocalDateTime.MAX;
- break;
- case 2:
- // 昨日
- startTime = LocalDateTime.now().minusDays(1);
- endTime = LocalDateTime.now().minusDays(1);
- break;
- case 3:
- // 近7天
- startTime = LocalDateTime.now().minusDays(7);
- endTime = LocalDateTime.now();
- break;
- case 4:
- // 近30天
- startTime = LocalDateTime.now().minusDays(30);
- endTime = LocalDateTime.now();
- break;
+ if(StringUtils.isEmpty(query.getStartTime()) && StringUtils.isEmpty(query.getEndTime())){
+ if(Objects.nonNull(query.getTimeType())){
+ LocalDateTime startTime = null;
+ LocalDateTime endTime = null;
+ switch (query.getTimeType()){
+ case 1:
+ // 今日
+ startTime = DateUtils.getDayStart(LocalDateTime.now());
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ case 2:
+ // 昨日
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(1));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now().minusDays(1));
+ break;
+ case 3:
+ // 近7天
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(7));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ case 4:
+ // 近30天
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(30));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ }
+ query.setStartTime(DateUtils.localDateTimeToDate(startTime));
+ query.setEndTime(DateUtils.localDateTimeToDate(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);
@@ -108,7 +117,14 @@
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());
+ BigDecimal goodsAmount = BigDecimal.ZERO;
+ Integer count = 0;
+ for (TOrderSaleGoods tOrderSaleGoods : collect) {
+ goodsAmount = goodsAmount.add(tOrderSaleGoods.getThisSalePrice().multiply(new BigDecimal(tOrderSaleGoods.getGoodsCount())));
+ count = count+tOrderSaleGoods.getGoodsCount();
+ }
+ e.setGoodsAmount(goodsAmount);
+ e.setGoodsCount(count);
e.setOrderSaleGoods(collect);
}
});
@@ -118,8 +134,42 @@
}
@Override
- public AmountSumVO amountSum(TOrderMealQuery query) {
- return this.baseMapper.amountSum(query);
+ public AmountSumVO amountSum(TOrderSaleQuery query) {
+ if(StringUtils.isEmpty(query.getStartTime()) && StringUtils.isEmpty(query.getEndTime())){
+ if(Objects.nonNull(query.getTimeType())){
+ LocalDateTime startTime = null;
+ LocalDateTime endTime = null;
+ switch (query.getTimeType()){
+ case 1:
+ // 今日
+ startTime = DateUtils.getDayStart(LocalDateTime.now());
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ case 2:
+ // 昨日
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(1));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now().minusDays(1));
+ break;
+ case 3:
+ // 近7天
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(7));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ case 4:
+ // 近30天
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(30));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ }
+ query.setStartTime(DateUtils.localDateTimeToDate(startTime));
+ query.setEndTime(DateUtils.localDateTimeToDate(endTime));
+ }
+ }
+ AmountSumVO amountSumVO = this.baseMapper.amountSum(query);
+ if(amountSumVO.getObligation().compareTo(BigDecimal.ZERO) < 0){
+ amountSumVO.setObligation(BigDecimal.ZERO);
+ }
+ return amountSumVO;
}
@Override
@@ -129,7 +179,10 @@
.add(salesVolumeVO.getMoneyPay()).add(salesVolumeVO.getAliPay()));
// 查询成本
List<TOrderSale> list = this.list(Wrappers.lambdaQuery(TOrderSale.class)
- .eq(TOrderSale::getShopId, query.getShopId()));
+ .eq(TOrderSale::getShopId, query.getShopId())
+ .ge(TOrderSale::getOrderTime, query.getStartTime())
+ .le(TOrderSale::getOrderTime, query.getEndTime())
+ .eq(TOrderSale::getStatus,2));
List<Long> ids = list.stream().map(TOrderSale::getId).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(ids)){
BigDecimal costTotal = orderSaleGoodsService.costTotal(ids);
@@ -140,56 +193,51 @@
}
@Override
- public List<SalesRankingVO> salesRanking(TDataStatisticsQuery query) {
+ public PageInfo<SalesRankingVO> salesRanking(TDataStatisticsQuery query) {
+ PageInfo<SalesRankingVO> pageInfo = new PageInfo<>(query.getPageNum(),query.getPageSize());
List<TOrderSale> list = this.list(Wrappers.lambdaQuery(TOrderSale.class)
.eq(TOrderSale::getShopId, query.getShopId())
.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<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(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);
- });
+ if(CollectionUtils.isEmpty(ids)){
+ return new PageInfo<>();
}
- return salesRankingVOS;
+ List<SalesRankingVO> salesRankingVOS = orderSaleGoodsMapper.salesRanking(ids,pageInfo);
+ pageInfo.setRecords(salesRankingVOS);
+ return pageInfo;
}
@Override
public List<TOrderSaleVO> exportOrderSale(TOrderMealQuery query) {
- if(Objects.nonNull(query.getTimeType())){
- LocalDateTime startTime = null;
- LocalDateTime endTime = null;
- switch (query.getTimeType()){
- case 1:
- // 今日
- startTime = LocalDateTime.MIN;
- endTime = LocalDateTime.MAX;
- break;
- case 2:
- // 昨日
- startTime = LocalDateTime.now().minusDays(1);
- endTime = LocalDateTime.now().minusDays(1);
- break;
- case 3:
- // 近7天
- startTime = LocalDateTime.now().minusDays(7);
- endTime = LocalDateTime.now();
- break;
- case 4:
- // 近30天
- startTime = LocalDateTime.now().minusDays(30);
- endTime = LocalDateTime.now();
- break;
+ if(StringUtils.isEmpty(query.getStartTime()) && StringUtils.isEmpty(query.getEndTime())){
+ if(Objects.nonNull(query.getTimeType())){
+ LocalDateTime startTime = null;
+ LocalDateTime endTime = null;
+ switch (query.getTimeType()){
+ case 1:
+ // 今日
+ startTime = DateUtils.getDayStart(LocalDateTime.now());
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ case 2:
+ // 昨日
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(1));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now().minusDays(1));
+ break;
+ case 3:
+ // 近7天
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(7));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ case 4:
+ // 近30天
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(30));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ }
+ query.setStartTime(DateUtils.localDateTimeToDate(startTime));
+ query.setEndTime(DateUtils.localDateTimeToDate(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());
@@ -210,6 +258,36 @@
@Override
public Map<String, Double> getDataGeneratorSaleDetail(TDataGeneratorSaleQuery query) {
+ if(StringUtils.isEmpty(query.getStartTime()) && StringUtils.isEmpty(query.getEndTime())){
+ if(Objects.nonNull(query.getTimeType())){
+ LocalDateTime startTime = null;
+ LocalDateTime endTime = null;
+ switch (query.getTimeType()){
+ case 1:
+ // 今日
+ startTime = DateUtils.getDayStart(LocalDateTime.now());
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ case 2:
+ // 昨日
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(1));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now().minusDays(1));
+ break;
+ case 3:
+ // 近7天
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(7));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ case 4:
+ // 近30天
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(30));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ }
+ query.setStartTime(DateUtils.localDateTimeToDate(startTime));
+ query.setEndTime(DateUtils.localDateTimeToDate(endTime));
+ }
+ }
return this.baseMapper.getDataGeneratorSaleDetail(query);
}
@@ -221,23 +299,23 @@
switch (query.getTimeType()){
case 1:
// 今日
- startTime = LocalDateTime.MIN;
- endTime = LocalDateTime.MAX;
+ startTime = DateUtils.getDayStart(LocalDateTime.now());
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
break;
case 2:
// 昨日
- startTime = LocalDateTime.now().minusDays(1);
- endTime = LocalDateTime.now().minusDays(1);
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(1));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now().minusDays(1));
break;
case 3:
// 近7天
- startTime = LocalDateTime.now().minusDays(7);
- endTime = LocalDateTime.now();
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(7));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
break;
case 4:
// 近30天
- startTime = LocalDateTime.now().minusDays(30);
- endTime = LocalDateTime.now();
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(30));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
break;
}
query.setStartTime(DateUtils.localDateTimeToDate(startTime));
@@ -261,6 +339,69 @@
orderSale.setPayType(dto.getPayType());
orderSale.setPayMoney(dto.getPayMoney());
orderSale.setStatus(2);
+
+
+
this.updateById(orderSale);
}
+
+ @Override
+ public void edit(TOrderSaleDTO dto) {
+ // 销售单号
+ List<TOrderSaleGoods> orderSaleGoods = dto.getOrderSaleGoods();
+ BigDecimal sum = orderSaleGoods.stream().map(TOrderSaleGoods::getGoodsSalePrice).reduce(BigDecimal::add).get();
+ dto.setOrderMoney(sum);
+ this.updateById(dto);
+ // 删除商品
+ orderSaleGoodsService.remove(Wrappers.lambdaQuery(TOrderSaleGoods.class)
+ .eq(TOrderSaleGoods::getOrderId,dto.getId()));
+ // 添加商品
+ orderSaleGoods.forEach(orderSaleGoods1 -> {
+ orderSaleGoods1.setOrderId(dto.getId());
+ orderSaleGoods1.setId(null);
+ });
+ orderSaleGoodsService.saveBatch(orderSaleGoods);
+ }
+
+ @Override
+ public List<TDataGeneratorVO> saleGeneratorListExport(TDataGeneratorQuery query) {
+ List<TDataGeneratorVO> list = this.baseMapper.saleGeneratorListExport(query);
+ List<Long> ids = list.stream().map(TDataGeneratorVO::getId).collect(Collectors.toList());
+ if(CollectionUtils.isEmpty(ids)){
+ return new ArrayList<>();
+ }
+ List<TOrderSale> orderSales = this.list(Wrappers.lambdaQuery(TOrderSale.class)
+ .in(TOrderSale::getGeneratorId, ids));
+ for (TDataGeneratorVO tDataGeneratorVO : list) {
+ List<TOrderSale> collect = orderSales.stream().filter(e -> e.getGeneratorId().equals(tDataGeneratorVO.getId())).collect(Collectors.toList());
+ BigDecimal money = BigDecimal.ZERO;
+ if(!CollectionUtils.isEmpty(collect)){
+ money = collect.stream().map(TOrderSale::getPayMoney).reduce(BigDecimal::add).get();
+ }
+ tDataGeneratorVO.setTotalRevenue(money);
+ }
+ return list;
+ }
+
+ @Override
+ public ProfitDetailsVO profitDetails(ProfitDetailsQuery query) {
+ ProfitDetailsVO profitDetailsVO = new ProfitDetailsVO();
+ // 查询商品盈利明细
+ PageInfo<GoodsProfitVO> pageInfo = new PageInfo<>(query.getPageNum(),query.getPageSize());
+ List<GoodsProfitVO> list = this.baseMapper.profitDetails(query,pageInfo);
+ pageInfo.setRecords(list);
+ profitDetailsVO.setGoodsProfitVOS(pageInfo);
+
+ // 统计商品金额
+ 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()));
+ return profitDetailsVO;
+ }
+
+ @Override
+ public List<GoodsProfitVO> profitDetailsExport(ProfitDetailsQuery query) {
+ return this.baseMapper.profitDetailsExport(query);
+ }
}
--
Gitblit v1.7.1