From 0af329d7210a84c97ec071735a2d0d1d7b0b785c Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 26 八月 2023 13:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtTotalController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtTotalController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtTotalController.java
index e3dcd22..893c878 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtTotalController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtTotalController.java
@@ -4,7 +4,9 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.member.domain.vo.MgtTotalMemberTotalVo;
import com.ruoyi.member.service.member.MemberService;
+import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
import com.ruoyi.system.api.domain.dto.MgtBaseShopDto;
+import com.ruoyi.system.api.domain.vo.MgtPlTotalMemberTotalVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestBody;
@@ -31,7 +33,7 @@
@RequestMapping(value = "/getTotalMemberTotal", method = RequestMethod.POST)
- @ApiOperation(value = "获取会员人数统计")
+ @ApiOperation(value = "获取商户会员人数统计(商户管理-统计经营-会员统计)")
public R<MgtTotalMemberTotalVo> getTotalMemberTotal(@RequestBody MgtBaseShopDto mgtBaseShopDto) {
Long userId = SecurityUtils.getUserId();
mgtBaseShopDto.setUserId(userId);
@@ -39,4 +41,13 @@
return R.ok(totalMemberTotalVo);
}
+ @RequestMapping(value = "/getPlTotalMemberTotal", method = RequestMethod.POST)
+ @ApiOperation(value = "获取平台会员人数统计(统计-会员统计)")
+ public R<MgtPlTotalMemberTotalVo> getPlTotalMemberTotal(@RequestBody MgtBasePlatformDto mgtBasePlatformDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtBasePlatformDto.setUserId(userId);
+ MgtPlTotalMemberTotalVo plTotalMemberTotal = memberService.getPlTotalMemberTotal(mgtBasePlatformDto);
+ return R.ok(plTotalMemberTotal);
+ }
+
}
--
Gitblit v1.7.1