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/business/MerTotalController.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerTotalController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerTotalController.java
index 913d2e4..c7a3e45 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerTotalController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerTotalController.java
@@ -2,7 +2,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.order.domain.vo.MerOrderTotalVo;
+import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.domain.dto.MerTotalDto;
import io.swagger.annotations.Api;
@@ -30,7 +30,7 @@
private OrderService orderService;
@RequestMapping(value = "/getMerOrderTotal", method = RequestMethod.POST)
- @ApiOperation(value = "商户获取订单统计")
+ @ApiOperation(value = "商户获取订单统计(订单概况/营业额概况)")
public R<MerOrderTotalVo> getMerOrderTotal(@RequestBody MerTotalDto merTotalDto) {
Long userId = SecurityUtils.getUserId();
merTotalDto.setUserId(userId);
@@ -38,6 +38,40 @@
return R.ok(orderTotalVo);
}
+ @RequestMapping(value = "/getMerOrderDistributionTotal", method = RequestMethod.POST)
+ @ApiOperation(value = "商户获取订单分布统计(订单分布)")
+ public R<MerOrderDistributionTotalVo> getMerOrderDistributionTotal(@RequestBody MerTotalDto merTotalDto) {
+ Long userId = SecurityUtils.getUserId();
+ merTotalDto.setUserId(userId);
+ MerOrderDistributionTotalVo orderTotalVo = orderService.MerOrderDistributionTotalVo(merTotalDto);
+ return R.ok(orderTotalVo);
+ }
+ @RequestMapping(value = "/getMerOrderTypeTotal", method = RequestMethod.POST)
+ @ApiOperation(value = "商户获取销售占比统计(销售占比)")
+ public R<MerOrderTypeTotalVo> getMerOrderTypeTotal(@RequestBody MerTotalDto merTotalDto) {
+ Long userId = SecurityUtils.getUserId();
+ merTotalDto.setUserId(userId);
+ MerOrderTypeTotalVo orderTotalVo = orderService.getMerOrderTypeTotal(merTotalDto);
+ return R.ok(orderTotalVo);
+ }
+
+ @RequestMapping(value = "/getMerOrderGoodsRank", method = RequestMethod.POST)
+ @ApiOperation(value = "商户获取销售排行(销售排行)")
+ public R<MerOrderGoodsRankVo> getMerOrderGoodsRank(@RequestBody MerTotalDto merTotalDto) {
+ Long userId = SecurityUtils.getUserId();
+ merTotalDto.setUserId(userId);
+ MerOrderGoodsRankVo orderTotalVo = orderService.getMerOrderGoodsRank(merTotalDto);
+ return R.ok(orderTotalVo);
+ }
+
+ @RequestMapping(value = "/getMerOrderFromRank", method = RequestMethod.POST)
+ @ApiOperation(value = "商户获取渠道排行(渠道排行)")
+ public R<MerOrderFromRankVo> getMerOrderFromRank(@RequestBody MerTotalDto merTotalDto) {
+ Long userId = SecurityUtils.getUserId();
+ merTotalDto.setUserId(userId);
+ MerOrderFromRankVo orderTotalVo = orderService.getMerOrderFromRank(merTotalDto);
+ return R.ok(orderTotalVo);
+ }
}
--
Gitblit v1.7.1