From abfedddb15ff90b7810a231dac964d2450372b94 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 10 九月 2024 09:01:42 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataStatisticsController.java | 64 ++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 11 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 3bbf0a1..2f9c3ec 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
@@ -2,12 +2,16 @@
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.query.TDataStatisticsQuery;
import com.ruoyi.system.service.TOrderMealService;
import com.ruoyi.system.service.TOrderSaleService;
+import com.ruoyi.system.vo.OrderTrendsVO;
+import com.ruoyi.system.vo.PersonnelStatisticsVO;
import com.ruoyi.system.vo.SalesRankingVO;
import com.ruoyi.system.vo.SalesVolumeVO;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -24,6 +28,7 @@
* @author xiaochen
* @since 2024-08-27
*/
+@Api(tags = "营业数据统计")
@RestController
@RequestMapping("/t-data-statistics")
public class TDataStatisticsController {
@@ -72,8 +77,8 @@
endTime = LocalDateTime.now();
break;
}
- query.setStartTime(startTime);
- query.setEndTime(endTime);
+ query.setStartTime(DateUtils.localDateTimeToDate(startTime));
+ query.setEndTime(DateUtils.localDateTimeToDate(endTime));
SalesVolumeVO salesVolumeVO;
if(roleType == 2){
salesVolumeVO = orderMealService.salesVolume(query);
@@ -116,8 +121,8 @@
endTime = LocalDateTime.now();
break;
}
- query.setStartTime(startTime);
- query.setEndTime(endTime);
+ query.setStartTime(DateUtils.localDateTimeToDate(startTime));
+ query.setEndTime(DateUtils.localDateTimeToDate(endTime));
List<SalesRankingVO> salesRankingVOS;
if(roleType == 2){
salesRankingVOS = orderMealService.salesRanking(query);
@@ -129,7 +134,7 @@
@ApiOperation( value = "下单趋势")
@PostMapping(value = "/orderingTrends")
- public AjaxResult<List<SalesRankingVO>> orderingTrends(@RequestBody TDataStatisticsQuery query) {
+ public AjaxResult<List<OrderTrendsVO>> orderingTrends(@RequestBody TDataStatisticsQuery query) {
Integer roleType = tokenService.getLoginUser().getRoleType();
Long objectId = tokenService.getLoginUser().getObjectId();
query.setShopId(objectId);
@@ -160,15 +165,52 @@
endTime = LocalDateTime.now();
break;
}
- query.setStartTime(startTime);
- query.setEndTime(endTime);
- List<SalesRankingVO> salesRankingVOS;
+ query.setStartTime(DateUtils.localDateTimeToDate(startTime));
+ query.setEndTime(DateUtils.localDateTimeToDate(endTime));
+ List<OrderTrendsVO> orderTrendsVOS;
if(roleType == 2){
- salesRankingVOS = orderMealService.salesRanking(query);
+ orderTrendsVOS = orderMealService.orderingTrends(query);
}else{
- salesRankingVOS = orderSaleService.salesRanking(query);
+ orderTrendsVOS = orderSaleService.orderingTrends(query);
}
- return AjaxResult.success(salesRankingVOS);
+ return AjaxResult.success(orderTrendsVOS);
+ }
+
+ @ApiOperation( value = "接待人数统计")
+ @PostMapping(value = "/personnelStatistics")
+ public AjaxResult<List<PersonnelStatisticsVO>> personnelStatistics(@RequestBody TDataStatisticsQuery query) {
+ Long objectId = tokenService.getLoginUser().getObjectId();
+ query.setShopId(objectId);
+ if(Objects.isNull(query.getTimeType())){
+ query.setTimeType(1);
+ }
+ 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;
+ }
+ query.setStartTime(DateUtils.localDateTimeToDate(startTime));
+ query.setEndTime(DateUtils.localDateTimeToDate(endTime));
+ return AjaxResult.success(orderMealService.personnelStatistics(query));
}
--
Gitblit v1.7.1