From 57580ea090d7637f0ad462ea169dea4001a80490 Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期三, 28 六月 2023 00:08:50 +0800
Subject: [PATCH] 统计BUG
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtTotalController.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtTotalController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtTotalController.java
index 8797b8f..123772c 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtTotalController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtTotalController.java
@@ -2,10 +2,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.order.domain.vo.MgtPlTotalActivityTotalVo;
-import com.ruoyi.order.domain.vo.MgtTotalActivityTotalVo;
-import com.ruoyi.order.domain.vo.MgtTotalDataTotalVo;
-import com.ruoyi.order.domain.vo.MgtTotalOrderTotalVo;
+import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.domain.dto.MgtActivityAgeDto;
import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
@@ -82,7 +79,7 @@
}
@RequestMapping(value = "/getPlTotalOrderTotal", method = RequestMethod.POST)
- @ApiOperation(value = "获取商户订单统计")
+ @ApiOperation(value = "获取平台商户订单统计")
public R<MgtTotalOrderTotalVo> getPlTotalOrderTotal(@RequestBody MgtBasePlatformDto mgtBasePlatformDto) {
Long userId = SecurityUtils.getUserId();
mgtBasePlatformDto.setUserId(userId);
@@ -91,7 +88,7 @@
}
@RequestMapping(value = "/getPlTotalActivityTotal", method = RequestMethod.POST)
- @ApiOperation(value = "获取商户活动统计")
+ @ApiOperation(value = "获取平台商户活动统计")
public R<MgtPlTotalActivityTotalVo> getPlTotalActivityTotal(@RequestBody MgtBasePlatformDto mgtBasePlatformDto) {
Long userId = SecurityUtils.getUserId();
mgtBasePlatformDto.setUserId(userId);
@@ -100,11 +97,11 @@
}
@RequestMapping(value = "/getPlTotalActivityAgeRank", method = RequestMethod.POST)
- @ApiOperation(value = "获取商户活动年龄分布")
- public R<MgtPlTotalActivityTotalVo> getPlTotalActivityAgeRank(@RequestBody MgtPlActivityAgeDto mgtPlActivityAgeDto) {
+ @ApiOperation(value = "获取平台商户活动年龄分布")
+ public R<List<MgtMapTotalPlusVo>> getPlTotalActivityAgeRank(@RequestBody MgtPlActivityAgeDto mgtPlActivityAgeDto) {
Long userId = SecurityUtils.getUserId();
mgtPlActivityAgeDto.setUserId(userId);
- MgtPlTotalActivityTotalVo totalActivityTotal = orderService.getPlTotalActivityAgeRank(mgtPlActivityAgeDto);
- return R.ok(totalActivityTotal);
+ List<MgtMapTotalPlusVo> ageRankList = orderService.getPlTotalActivityAgeRank(mgtPlActivityAgeDto);
+ return R.ok(ageRankList);
}
}
--
Gitblit v1.7.1