From aefe81a52fcbda2175b40575982d18e648e7013c Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 08 七月 2025 11:36:22 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtTotalController.java | 52 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 34 insertions(+), 18 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 802ae68..fa908ea 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
@@ -3,10 +3,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
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.MgtBasePlatformDto;
import com.ruoyi.system.api.domain.dto.MgtBaseShopDto;
@@ -42,7 +39,6 @@
public R<MgtTotalOrderTotalVo> getTotalOrderTotal(@RequestBody MgtBaseShopDto mgtBaseShopDto) {
Long userId = SecurityUtils.getUserId();
- mgtBaseShopDto.setUserId(userId);
MgtTotalOrderTotalVo totalOrderTotalVo = orderService.getTotalOrderTotal(mgtBaseShopDto);
return R.ok(totalOrderTotalVo);
}
@@ -51,8 +47,16 @@
@ApiOperation(value = "获取商户活动统计(商户管理-统计经营-活动统计)")
public R<MgtTotalActivityTotalVo> getTotalActivityTotal(@RequestBody MgtBaseShopDto mgtBaseShopDto) {
Long userId = SecurityUtils.getUserId();
- mgtBaseShopDto.setUserId(userId);
+
MgtTotalActivityTotalVo totalActivityTotal = orderService.getTotalActivityTotal(mgtBaseShopDto);
+ return R.ok(totalActivityTotal);
+ }
+
+ @RequestMapping(value = "/getTotalActivityJoinMemberTotal", method = RequestMethod.POST)
+ @ApiOperation(value = "获取商户活动统计(商户管理-统计经营-活动统计-参与人数)")
+ public R<MgtTotalActivityTotalVo> getTotalActivityJoinMemberTotal(@RequestBody MgtBaseShopDto mgtBaseShopDto) {
+ Long userId = SecurityUtils.getUserId();
+ MgtTotalActivityTotalVo totalActivityTotal = orderService.getTotalActivityJoinMemberTotal(mgtBaseShopDto);
return R.ok(totalActivityTotal);
}
@@ -69,7 +73,6 @@
@ApiOperation(value = "获取商户数据统计(商户管理-统计经营-数据统计)")
public R<MgtTotalDataTotalVo> getTotalDataTotal(@RequestBody MgtBaseShopDto mgtBaseShopDto) {
Long userId = SecurityUtils.getUserId();
- mgtBaseShopDto.setUserId(userId);
MgtTotalDataTotalVo totalDataTotalVo = orderService.getTotalDataTotal(mgtBaseShopDto);
return R.ok(totalDataTotalVo);
}
@@ -78,7 +81,6 @@
@ApiOperation(value = "获取平台商户数据统计(统计-店铺数据统计)")
public R<List<MgtTotalDataTotalVo>> getPlTotalDataTotal(@RequestBody MgtBasePlatformDto mgtBasePlatformDto) {
Long userId = SecurityUtils.getUserId();
- mgtBasePlatformDto.setUserId(userId);
List<MgtTotalDataTotalVo> totalDataTotalVoList = orderService.getPlTotalDataTotal(mgtBasePlatformDto);
return R.ok(totalDataTotalVoList);
}
@@ -87,7 +89,6 @@
@ApiOperation(value = "导出平台商户数据统计(统计-店铺数据统计)")
public void exportPlTotalDataTotal(MgtBasePlatformDto mgtBasePlatformDto, HttpServletResponse response) {
Long userId = SecurityUtils.getUserId();
- mgtBasePlatformDto.setUserId(userId);
List<MgtTotalDataTotalVo> totalDataTotalVoList = orderService.getPlTotalDataTotal(mgtBasePlatformDto);
ExcelUtil<MgtTotalDataTotalVo> util = new ExcelUtil<MgtTotalDataTotalVo>(MgtTotalDataTotalVo.class);
util.exportExcel(response, totalDataTotalVoList, "店铺数据统计列表");
@@ -97,7 +98,6 @@
@ApiOperation(value = "获取平台商户订单统计(统计-经营统计)")
public R<MgtTotalOrderTotalVo> getPlTotalOrderTotal(@RequestBody MgtBasePlatformDto mgtBasePlatformDto) {
Long userId = SecurityUtils.getUserId();
- mgtBasePlatformDto.setUserId(userId);
MgtTotalOrderTotalVo totalOrderTotalVo = orderService.getPlTotalOrderTotal(mgtBasePlatformDto);
return R.ok(totalOrderTotalVo);
}
@@ -106,17 +106,33 @@
@ApiOperation(value = "获取平台商户活动统计(统计-活动统计)")
public R<MgtPlTotalActivityTotalVo> getPlTotalActivityTotal(@RequestBody MgtBasePlatformDto mgtBasePlatformDto) {
Long userId = SecurityUtils.getUserId();
- mgtBasePlatformDto.setUserId(userId);
MgtPlTotalActivityTotalVo totalActivityTotal = orderService.getPlTotalActivityTotal(mgtBasePlatformDto);
return R.ok(totalActivityTotal);
}
- /*@RequestMapping(value = "/getPlTotalActivityAgeRank", method = RequestMethod.POST)
- @ApiOperation(value = "获取平台商户活动年龄分布")
- public R<MgtPlTotalActivityTotalVo> getPlTotalActivityAgeRank(@RequestBody MgtPlActivityAgeDto mgtPlActivityAgeDto) {
+ @RequestMapping(value = "/getPlTotalActivityJoinMemberTotal", method = RequestMethod.POST)
+ @ApiOperation(value = "获取平台商户活动统计(统计-活动统计-参与人数)")
+ public R<MgtPlTotalActivityTotalVo> getPlTotalActivityJoinMemberTotal(@RequestBody MgtBasePlatformDto mgtBasePlatformDto) {
Long userId = SecurityUtils.getUserId();
- mgtPlActivityAgeDto.setUserId(userId);
- MgtPlTotalActivityTotalVo plTotalActivityTotalVo = orderService.getPlTotalActivityAgeRank(mgtPlActivityAgeDto);
- return R.ok(plTotalActivityTotalVo);
- }*/
+ MgtPlTotalActivityTotalVo totalActivityTotal = orderService.getPlTotalActivityJoinMemberTotal(mgtBasePlatformDto);
+ return R.ok(totalActivityTotal);
+ }
+
+ @RequestMapping(value = "/getPlTotalActivityGetMemberTotal", method = RequestMethod.POST)
+ @ApiOperation(value = "获取平台商户活动统计(统计-活动统计-获客人数)")
+ public R<MgtPlTotalActivityTotalVo> getPlTotalActivityGetMemberTotal(@RequestBody MgtBasePlatformDto mgtBasePlatformDto) {
+ Long userId = SecurityUtils.getUserId();
+ MgtPlTotalActivityTotalVo totalActivityTotal = orderService.getPlTotalActivityGetMemberTotal(mgtBasePlatformDto);
+ return R.ok(totalActivityTotal);
+ }
+
+
+ @RequestMapping(value = "/getPlTotalThirdOrderStatics", method = RequestMethod.POST)
+ @ApiOperation(value = "获取三方订单统计【2.0】")
+ public R<MgtPlTotalThirdOrderStaticsVO> getPlTotalThirdOrderStatics(@RequestBody MgtBasePlatformDto mgtBasePlatformDto) {
+ Long userId = SecurityUtils.getUserId();
+ MgtPlTotalThirdOrderStaticsVO totalActivityTotal = orderService.getPlTotalThirdOrderStatics(mgtBasePlatformDto);
+ return R.ok(totalActivityTotal);
+ }
+
}
--
Gitblit v1.7.1