From b879982d29cb2dbfe72482b46c8f6f2064d663a2 Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 26 八月 2023 15:27:29 +0800
Subject: [PATCH] 支付调整
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtTotalController.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 7706c67..cdef597 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,7 +2,10 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.order.domain.vo.*;
+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.service.order.OrderService;
import com.ruoyi.system.api.domain.dto.MgtActivityAgeDto;
import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
@@ -30,12 +33,14 @@
@RequestMapping("/mgt/total")
public class MgtTotalController {
+
@Resource
private OrderService orderService;
@RequestMapping(value = "/getTotalOrderTotal", method = RequestMethod.POST)
@ApiOperation(value = "获取商户订单统计")
public R<MgtTotalOrderTotalVo> getTotalOrderTotal(@RequestBody MgtBaseShopDto mgtBaseShopDto) {
+
Long userId = SecurityUtils.getUserId();
mgtBaseShopDto.setUserId(userId);
MgtTotalOrderTotalVo totalOrderTotalVo = orderService.getTotalOrderTotal(mgtBaseShopDto);
@@ -61,7 +66,7 @@
}
@RequestMapping(value = "/getTotalDataTotal", method = RequestMethod.POST)
- @ApiOperation(value = "获取商户数据统计")
+ @ApiOperation(value = "获取商户数据统计(数据统计)")
public R<MgtTotalDataTotalVo> getTotalDataTotal(@RequestBody MgtBaseShopDto mgtBaseShopDto) {
Long userId = SecurityUtils.getUserId();
mgtBaseShopDto.setUserId(userId);
@@ -79,7 +84,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);
@@ -88,7 +93,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);
@@ -98,10 +103,10 @@
@RequestMapping(value = "/getPlTotalActivityAgeRank", method = RequestMethod.POST)
@ApiOperation(value = "获取平台商户活动年龄分布")
- public R<List<MgtMapTotalPlusVo>> getPlTotalActivityAgeRank(@RequestBody MgtPlActivityAgeDto mgtPlActivityAgeDto) {
+ public R<MgtPlTotalActivityTotalVo> getPlTotalActivityAgeRank(@RequestBody MgtPlActivityAgeDto mgtPlActivityAgeDto) {
Long userId = SecurityUtils.getUserId();
mgtPlActivityAgeDto.setUserId(userId);
- List<MgtMapTotalPlusVo> ageRankList = orderService.getPlTotalActivityAgeRank(mgtPlActivityAgeDto);
- return R.ok(ageRankList);
+ MgtPlTotalActivityTotalVo plTotalActivityTotalVo = orderService.getPlTotalActivityAgeRank(mgtPlActivityAgeDto);
+ return R.ok(plTotalActivityTotalVo);
}
}
--
Gitblit v1.7.1