From beeda8df0023376dbb2021148a021731dc4aedb0 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 06 八月 2023 11:29:10 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtTotalController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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..c0f824a 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
@@ -33,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);
@@ -82,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);
@@ -91,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);
@@ -100,11 +102,11 @@
}
@RequestMapping(value = "/getPlTotalActivityAgeRank", method = RequestMethod.POST)
- @ApiOperation(value = "获取商户活动年龄分布")
+ @ApiOperation(value = "获取平台商户活动年龄分布")
public R<MgtPlTotalActivityTotalVo> getPlTotalActivityAgeRank(@RequestBody MgtPlActivityAgeDto mgtPlActivityAgeDto) {
Long userId = SecurityUtils.getUserId();
mgtPlActivityAgeDto.setUserId(userId);
- MgtPlTotalActivityTotalVo totalActivityTotal = orderService.getPlTotalActivityAgeRank(mgtPlActivityAgeDto);
- return R.ok(totalActivityTotal);
+ MgtPlTotalActivityTotalVo plTotalActivityTotalVo = orderService.getPlTotalActivityAgeRank(mgtPlActivityAgeDto);
+ return R.ok(plTotalActivityTotalVo);
}
}
--
Gitblit v1.7.1