From 8b0f0fa277a2390463c6582c4fbe8600e1e53ced Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 31 五月 2023 18:19:16 +0800
Subject: [PATCH] 用户管理商户管理
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java
index ac3fac6..210bea9 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java
@@ -3,13 +3,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.member.domain.dto.MgtMemberIntEditDto;
-import com.ruoyi.member.domain.dto.MgtMemberPageDto;
-import com.ruoyi.member.domain.dto.MgtMemberRelDelDto;
-import com.ruoyi.member.domain.dto.MgtMemberRelEditDto;
-import com.ruoyi.member.domain.vo.MerMemberInfoVo;
-import com.ruoyi.member.domain.vo.MgtMemberGetVo;
-import com.ruoyi.member.domain.vo.MgtMemberPageVo;
+import com.ruoyi.member.domain.dto.*;
+import com.ruoyi.member.domain.vo.*;
+import com.ruoyi.member.service.member.BrowseRecordService;
+import com.ruoyi.member.service.member.IntegralRecordService;
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.system.api.domain.dto.MerBaseGetDto;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
@@ -39,6 +36,11 @@
@Autowired
private MemberService memberService;
+ @Autowired
+ private IntegralRecordService integralRecordService;
+
+ @Autowired
+ private BrowseRecordService browseRecordService;
@RequestMapping(value = "/pageMgtMember", method = RequestMethod.POST)
@ApiOperation(value = "分页获取会员列表")
@@ -69,7 +71,7 @@
}
@RequestMapping(value = "/editMemberIntegral", method = RequestMethod.POST)
- @ApiOperation(value = "修改会员关联商户")
+ @ApiOperation(value = "修改会员积分")
public R<MerMemberInfoVo> editMemberIntegral(@RequestBody MgtMemberIntEditDto mgtMemberIntEditDto) {
Long userId = SecurityUtils.getUserId();
mgtMemberIntEditDto.setUserId(userId);
@@ -88,6 +90,29 @@
+ @RequestMapping(value = "/pageMgtMemberIntegral", method = RequestMethod.POST)
+ @ApiOperation(value = "平台获取用户积分列表")
+ public R<Page<MgtMemberIntegralPageVo>> pageMgtMemberIntegral(@RequestBody MgtMemberIntegralPageDto mgtMemberIntegralPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtMemberIntegralPageDto.setUserId(userId);
+ Page<MgtMemberIntegralPageVo> page = new Page<>();
+ page.setSize(mgtMemberIntegralPageDto.getPageSize());
+ page.setCurrent(mgtMemberIntegralPageDto.getPageNum());
+ List<MgtMemberIntegralPageVo> mgtMemberIntegralPageVoList = integralRecordService.pageMgtMemberIntegral(page,mgtMemberIntegralPageDto);
+ return R.ok(page.setRecords(mgtMemberIntegralPageVoList));
+ }
+
+ @RequestMapping(value = "/pageMgtMemberBrowse", method = RequestMethod.POST)
+ @ApiOperation(value = "平台获取用户浏览记录")
+ public R<Page<MgtMemberBrowsePageVo>> pageMgtMemberBrowse(@RequestBody MgtMemberBrowsePageDto mgtMemberBrowsePageDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtMemberBrowsePageDto.setUserId(userId);
+ Page<MgtMemberBrowsePageVo> page = new Page<>();
+ page.setSize(mgtMemberBrowsePageDto.getPageSize());
+ page.setCurrent(mgtMemberBrowsePageDto.getPageNum());
+ List<MgtMemberBrowsePageVo> mgtMemberBrowsePageVoList = browseRecordService.pageMgtMemberBrowse(page,mgtMemberBrowsePageDto);
+ return R.ok(page.setRecords(mgtMemberBrowsePageVoList));
+ }
}
--
Gitblit v1.7.1