From 508f3e225df87e0da974424981e7782fc5ce875c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 19 五月 2025 14:21:39 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderSaleServiceImpl.java | 154 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 138 insertions(+), 16 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 d1a483d..8c0cfa0 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
@@ -1,5 +1,6 @@
package com.ruoyi.system.service.impl;
+import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
@@ -10,6 +11,8 @@
import com.ruoyi.system.domain.*;
import com.ruoyi.system.dto.CheckoutDTO;
import com.ruoyi.system.dto.TOrderSaleDTO;
+import com.ruoyi.system.export.SumGeneratorClient;
+import com.ruoyi.system.export.SumGeneratorDetailClient;
import com.ruoyi.system.mapper.TOrderSaleGoodsMapper;
import com.ruoyi.system.mapper.TOrderSaleMapper;
import com.ruoyi.system.query.*;
@@ -22,10 +25,7 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -45,6 +45,8 @@
private TOrderStockGoodsService orderStockGoodsService;
@Autowired
private TOrderSaleGoodsMapper orderSaleGoodsMapper;
+ @Autowired
+ private TGoodsService goodsService;
@Override
public void add(TOrderSaleDTO dto) {
// 查询菜品分类
@@ -58,6 +60,18 @@
}
dto.setOrderMoney(sum);
this.save(dto);
+
+ List<TGoods> goods = goodsService.list(Wrappers.lambdaQuery(TGoods.class).eq(TGoods::getShopId,dto.getShopId()));
+ List<TGoods> goodsList = new ArrayList<>();
+ for (TOrderSaleGoods orderSaleGood : orderSaleGoods) {
+ goods.forEach(good -> {
+ if(orderSaleGood.getGoodsNum().equals(good.getGoodsNum())){
+ good.setInventory(good.getInventory()-orderSaleGood.getGoodsCount());
+ goodsList.add(good);
+ }
+ });
+ }
+ goodsService.updateBatchById(goodsList);
// 查询进货数据
List<TOrderStockGoods> orderStockGoodsList = orderStockGoodsService.getListByTimeAndShopId(DateUtils.localDateToString(dto.getOrderTime()), dto.getShopId());
@@ -78,7 +92,7 @@
@Override
public PageInfo<TOrderSaleVO> pageList(TOrderSaleQuery query) {
- if(Objects.isNull(query.getStartTime()) && Objects.isNull(query.getEndTime())){
+ if(StringUtils.isEmpty(query.getStartTime()) && StringUtils.isEmpty(query.getEndTime())){
if(Objects.nonNull(query.getTimeType())){
LocalDateTime startTime = null;
LocalDateTime endTime = null;
@@ -135,6 +149,36 @@
@Override
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);
@@ -211,24 +255,59 @@
}
List<TOrderSaleVO> list = this.baseMapper.exportOrderSale(query);
List<Long> ids = list.stream().map(TOrderSaleVO::getId).collect(Collectors.toList());
- List<TOrderSaleGoods> list1 = orderSaleGoodsService.list(Wrappers.lambdaQuery(TOrderSaleGoods.class)
- .in(TOrderSaleGoods::getOrderId,ids));
- // 查询商品信息
- for (TOrderSaleVO orderSaleVO : list) {
- List<TOrderSaleGoods> collect = list1.stream().filter(e -> e.getOrderId().equals(orderSaleVO.getId())).collect(Collectors.toList());
- orderSaleVO.setOrderSaleGoods(collect);
+ 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)){
+ 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);
+ }
+ });
}
return list;
}
@Override
public List<OrderTrendsVO> orderingTrends(TDataStatisticsQuery query) {
- return this.baseMapper.orderingTrends(query);
+ List<OrderTrendsVO> orderTrendsVOS = this.baseMapper.orderingTrends(query);
+ LocalDate localDate = DateUtils.stringToLocalDateTime(query.getEndTime()).toLocalDate();
+ for (int i = 0; i < 7; i++) {
+ if(i == 0){
+ LocalDate finalLocalDate = localDate;
+ OrderTrendsVO orderTrendsVO = orderTrendsVOS.stream().filter(e -> finalLocalDate.compareTo(DateUtils.stringToLocalDate(e.getDayTime())) == 0).findFirst().orElse(null);
+ if(Objects.isNull(orderTrendsVO)){
+ orderTrendsVO = new OrderTrendsVO();
+ orderTrendsVO.setDayTime(DateUtils.localDateToString(localDate));
+ orderTrendsVO.setOrderCount(0);
+ orderTrendsVOS.add(orderTrendsVO);
+ }
+ }else {
+ localDate = localDate.minusDays(1);
+ LocalDate finalLocalDate1 = localDate;
+ OrderTrendsVO orderTrendsVO = orderTrendsVOS.stream().filter(e -> finalLocalDate1.compareTo(DateUtils.stringToLocalDate(e.getDayTime())) == 0).findFirst().orElse(null);
+ if(Objects.isNull(orderTrendsVO)){
+ orderTrendsVO = new OrderTrendsVO();
+ orderTrendsVO.setDayTime(DateUtils.localDateToString(finalLocalDate1));
+ orderTrendsVO.setOrderCount(0);
+ orderTrendsVOS.add(orderTrendsVO);
+ }
+ }
+ }
+ return orderTrendsVOS.stream().sorted(Comparator.comparing(OrderTrendsVO::getDayTime)).collect(Collectors.toList());
}
@Override
public Map<String, Double> getDataGeneratorSaleDetail(TDataGeneratorSaleQuery query) {
- if(Objects.isNull(query.getStartTime()) && Objects.isNull(query.getEndTime())){
+ if(StringUtils.isEmpty(query.getStartTime()) && StringUtils.isEmpty(query.getEndTime())){
if(Objects.nonNull(query.getTimeType())){
LocalDateTime startTime = null;
LocalDateTime endTime = null;
@@ -340,10 +419,12 @@
List<TOrderSale> orderSales = this.list(Wrappers.lambdaQuery(TOrderSale.class)
.in(TOrderSale::getGeneratorId, ids));
for (TDataGeneratorVO tDataGeneratorVO : list) {
- if(!CollectionUtils.isEmpty(orderSales)){
- BigDecimal money = orderSales.stream().map(TOrderSale::getPayMoney).reduce(BigDecimal::add).get();
- tDataGeneratorVO.setTotalRevenue(money);
+ 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;
}
@@ -369,4 +450,45 @@
public List<GoodsProfitVO> profitDetailsExport(ProfitDetailsQuery query) {
return this.baseMapper.profitDetailsExport(query);
}
+
+ @Override
+ public void deleteByShopId(Long shopId) {
+ this.baseMapper.deleteByShopId(shopId);
+ }
+
+ @Override
+ public Map<String, Double> getDataGeneratorSaleDetailOrderMoney(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.getDataGeneratorSaleDetailOrderMoney(query);
+ }
+
}
--
Gitblit v1.7.1