From 5627daeb1ac1a29947e902f9a7efb6730ed98611 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期五, 07 七月 2023 20:35:50 +0800 Subject: [PATCH] 管理台bug和用户端生日卡 --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerTotalController.java | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 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..6003f99 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; @@ -38,6 +38,39 @@ 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