From b3942f278045cf74410d81a62ded4696f22d170d Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 26 八月 2023 13:08:14 +0800
Subject: [PATCH] Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtTotalController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 70010a5..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);
--
Gitblit v1.7.1