From 66a4d910a33d1273427b513e008bd9cd4c5d4054 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 23 九月 2024 19:04:15 +0800
Subject: [PATCH] 修改接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataStatisticsController.java | 365 ++++++++++++++++++++++++++++-----------------------
1 files changed, 198 insertions(+), 167 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataStatisticsController.java
index 6abf2f8..05184d3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataStatisticsController.java
@@ -3,8 +3,10 @@
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.WebUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.export.SaleGeneratorListExport;
@@ -19,6 +21,7 @@
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -26,6 +29,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -61,35 +65,37 @@
Integer roleType = tokenService.getLoginUser().getRoleType();
Long objectId = tokenService.getLoginUser().getObjectId();
query.setShopId(objectId);
- if(Objects.isNull(query.getTimeType())){
- query.setTimeType(1);
+ if(StringUtils.isEmpty(query.getStartTime()) && StringUtils.isEmpty(query.getEndTime())){
+ if(Objects.isNull(query.getTimeType())){
+ query.setTimeType(1);
+ }
+ 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));
}
- 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));
SalesVolumeVO salesVolumeVO;
if(roleType == 2){
salesVolumeVO = orderMealService.salesVolume(query);
@@ -104,33 +110,35 @@
public AjaxResult<ProfitDetailsVO> profitDetails(@RequestBody ProfitDetailsQuery query) {
Long objectId = tokenService.getLoginUser().getObjectId();
query.setShopId(objectId);
- 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;
+ 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));
}
return AjaxResult.success(orderMealService.profitDetails(query));
}
@@ -140,33 +148,36 @@
public void profitDetailsExport(@RequestBody ProfitDetailsQuery query) {
Long objectId = tokenService.getLoginUser().getObjectId();
query.setShopId(objectId);
- 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;
+ 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<GoodsProfitVO> list = orderMealService.profitDetailsExport(query);
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), GoodsProfitVO.class, list);
@@ -195,40 +206,42 @@
@ApiOperation( value = "商品分类销售排行")
@PostMapping(value = "/salesRanking")
- public AjaxResult<List<SalesRankingVO>> salesRanking(@RequestBody TDataStatisticsQuery query) {
+ public AjaxResult<PageInfo<SalesRankingVO>> salesRanking(@RequestBody TDataStatisticsQuery query) {
Integer roleType = tokenService.getLoginUser().getRoleType();
Long objectId = tokenService.getLoginUser().getObjectId();
query.setShopId(objectId);
- if(Objects.isNull(query.getTimeType())){
- query.setTimeType(1);
+ if(StringUtils.isEmpty(query.getStartTime()) && StringUtils.isEmpty(query.getEndTime())){
+ if(Objects.isNull(query.getTimeType())){
+ query.setTimeType(1);
+ }
+ 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));
}
- 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));
- List<SalesRankingVO> salesRankingVOS;
+ PageInfo<SalesRankingVO> salesRankingVOS;
if(roleType == 2){
salesRankingVOS = orderMealService.salesRanking(query);
}else{
@@ -243,79 +256,97 @@
Integer roleType = tokenService.getLoginUser().getRoleType();
Long objectId = tokenService.getLoginUser().getObjectId();
query.setShopId(objectId);
- if(Objects.isNull(query.getTimeType())){
- query.setTimeType(3);
+ if(StringUtils.isEmpty(query.getStartTime()) && StringUtils.isEmpty(query.getEndTime())){
+
+ if(Objects.isNull(query.getTimeType())){
+ query.setTimeType(3);
+ }
+ 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));
}
- 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));
List<OrderTrendsVO> orderTrendsVOS;
if(roleType == 2){
orderTrendsVOS = orderMealService.orderingTrends(query);
}else{
orderTrendsVOS = orderSaleService.orderingTrends(query);
}
+ if (!CollectionUtils.isEmpty(orderTrendsVOS) && Objects.isNull(orderTrendsVOS.get(0).getDayTime())){
+ orderTrendsVOS.get(0).setDayTime(LocalDate.now().toString());
+ }
return AjaxResult.success(orderTrendsVOS);
}
@ApiOperation( value = "接待人数统计")
@PostMapping(value = "/personnelStatistics")
- public AjaxResult<List<PersonnelStatisticsVO>> personnelStatistics(@RequestBody TDataStatisticsQuery query) {
+ public AjaxResult<PersonnelStatisticsAndSumVO> personnelStatistics(@RequestBody TDataStatisticsQuery query) {
Long objectId = tokenService.getLoginUser().getObjectId();
query.setShopId(objectId);
- if(Objects.isNull(query.getTimeType())){
- query.setTimeType(1);
+ if(StringUtils.isEmpty(query.getStartTime()) && StringUtils.isEmpty(query.getEndTime())){
+
+ if(Objects.isNull(query.getTimeType())){
+ query.setTimeType(1);
+ }
+ 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));
}
- 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;
+
+ PersonnelStatisticsAndSumVO personnelStatisticsAndSumVO = new PersonnelStatisticsAndSumVO();
+ List<PersonnelStatisticsVO> personnelStatisticsVOS = orderMealService.personnelStatistics(query);
+ personnelStatisticsAndSumVO.setPersonnelStatisticsVOS(personnelStatisticsVOS);
+ if(!CollectionUtils.isEmpty(personnelStatisticsVOS)){
+ personnelStatisticsAndSumVO.setPersonCountSum(personnelStatisticsVOS.stream().filter(e->e.getPersonCount() != null).mapToInt(PersonnelStatisticsVO::getPersonCount).sum());
+ // 计算列表中平均金额乘以人数的总和
+ personnelStatisticsAndSumVO.setTotalMoney(personnelStatisticsVOS.stream().filter(e->e.getPersonCount() != null).mapToDouble(personnelStatisticsVO -> personnelStatisticsVO.getAvgAmount().doubleValue() * personnelStatisticsVO.getPersonCount()).sum());
}
- query.setStartTime(DateUtils.localDateTimeToDate(startTime));
- query.setEndTime(DateUtils.localDateTimeToDate(endTime));
- return AjaxResult.success(orderMealService.personnelStatistics(query));
+ return AjaxResult.success(personnelStatisticsAndSumVO);
}
--
Gitblit v1.7.1