From 156e141e55a8abf486157d1fa89d25e23f4a06a3 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期五, 25 八月 2023 19:32:30 +0800 Subject: [PATCH] bug --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtTotalController.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 46 insertions(+), 4 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 c36f0a9..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,12 +2,15 @@ import com.ruoyi.common.core.domain.R; 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.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 +19,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; /** * @author jqs34 @@ -29,12 +33,14 @@ @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); @@ -42,7 +48,7 @@ } @RequestMapping(value = "/getTotalActivityTotal", method = RequestMethod.POST) - @ApiOperation(value = "获取活动统计") + @ApiOperation(value = "获取商户活动统计") public R<MgtTotalActivityTotalVo> getTotalActivityTotal(@RequestBody MgtBaseShopDto mgtBaseShopDto) { Long userId = SecurityUtils.getUserId(); mgtBaseShopDto.setUserId(userId); @@ -51,7 +57,7 @@ } @RequestMapping(value = "/getTotalActivityAgeRank", method = RequestMethod.POST) - @ApiOperation(value = "获取活动年龄分布") + @ApiOperation(value = "获取商户活动年龄分布") public R<MgtTotalActivityTotalVo> getTotalActivityAgeRank(@RequestBody MgtActivityAgeDto mgtActivityAgeDto) { Long userId = SecurityUtils.getUserId(); mgtActivityAgeDto.setUserId(userId); @@ -60,11 +66,47 @@ } @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 = "获取平台商户数据统计") + 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 = "/getPlTotalOrderTotal", method = RequestMethod.POST) + @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 = "获取平台商户活动统计") + 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) { + Long userId = SecurityUtils.getUserId(); + mgtPlActivityAgeDto.setUserId(userId); + MgtPlTotalActivityTotalVo plTotalActivityTotalVo = orderService.getPlTotalActivityAgeRank(mgtPlActivityAgeDto); + return R.ok(plTotalActivityTotalVo); + } } -- Gitblit v1.7.1