From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtTotalController.java | 72 ++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 23 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..cd178ca 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
@@ -1,13 +1,15 @@
package com.ruoyi.order.controller.management;
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.*;
+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;
import com.ruoyi.system.api.domain.dto.MgtBaseShopDto;
-import com.ruoyi.system.api.domain.dto.MgtPlActivityAgeDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestBody;
@@ -16,6 +18,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -30,78 +33,101 @@
@RequestMapping("/mgt/total")
public class MgtTotalController {
+
@Resource
private OrderService orderService;
@RequestMapping(value = "/getTotalOrderTotal", method = RequestMethod.POST)
- @ApiOperation(value = "获取商户订单统计")
+ @ApiOperation(value = "获取商户订单统计(商户管理-统计经营-经营统计)")
public R<MgtTotalOrderTotalVo> getTotalOrderTotal(@RequestBody MgtBaseShopDto mgtBaseShopDto) {
+
Long userId = SecurityUtils.getUserId();
- mgtBaseShopDto.setUserId(userId);
MgtTotalOrderTotalVo totalOrderTotalVo = orderService.getTotalOrderTotal(mgtBaseShopDto);
return R.ok(totalOrderTotalVo);
}
@RequestMapping(value = "/getTotalActivityTotal", method = RequestMethod.POST)
- @ApiOperation(value = "获取商户活动统计")
+ @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 = "/getTotalActivityAgeRank", method = RequestMethod.POST)
+ @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);
+ }
+
+ /*@RequestMapping(value = "/getTotalActivityAgeRank", method = RequestMethod.POST)
@ApiOperation(value = "获取商户活动年龄分布")
public R<MgtTotalActivityTotalVo> getTotalActivityAgeRank(@RequestBody MgtActivityAgeDto mgtActivityAgeDto) {
Long userId = SecurityUtils.getUserId();
mgtActivityAgeDto.setUserId(userId);
MgtTotalActivityTotalVo totalActivityTotal = orderService.getTotalActivityAgeRank(mgtActivityAgeDto);
return R.ok(totalActivityTotal);
- }
+ }*/
@RequestMapping(value = "/getTotalDataTotal", method = RequestMethod.POST)
- @ApiOperation(value = "获取商户数据统计")
+ @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);
}
@RequestMapping(value = "/getPlTotalDataTotal", method = RequestMethod.POST)
- @ApiOperation(value = "获取平台商户数据统计")
+ @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);
}
+ @RequestMapping(value = "/exportPlTotalDataTotal", method = RequestMethod.POST)
+ @ApiOperation(value = "导出平台商户数据统计(统计-店铺数据统计)")
+ public void exportPlTotalDataTotal(MgtBasePlatformDto mgtBasePlatformDto, HttpServletResponse response) {
+ Long userId = SecurityUtils.getUserId();
+ List<MgtTotalDataTotalVo> totalDataTotalVoList = orderService.getPlTotalDataTotal(mgtBasePlatformDto);
+ ExcelUtil<MgtTotalDataTotalVo> util = new ExcelUtil<MgtTotalDataTotalVo>(MgtTotalDataTotalVo.class);
+ util.exportExcel(response, totalDataTotalVoList, "店铺数据统计列表");
+ }
+
@RequestMapping(value = "/getPlTotalOrderTotal", method = RequestMethod.POST)
- @ApiOperation(value = "获取平台商户订单统计")
+ @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);
}
@RequestMapping(value = "/getPlTotalActivityTotal", method = RequestMethod.POST)
- @ApiOperation(value = "获取平台商户活动统计")
+ @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);
+ }
+
+
}
--
Gitblit v1.7.1