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-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java |   83 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 69 insertions(+), 14 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 45f7f60..5999d8d 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,11 +3,14 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.member.domain.dto.*;
 import com.ruoyi.member.domain.vo.*;
 import com.ruoyi.member.service.member.*;
 import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
+import com.ruoyi.system.api.domain.dto.MgtFrozenMemberDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -54,22 +57,31 @@
         Page<MgtMemberPageVo> page = new Page<>();
         page.setSize(mgtMemberPageDto.getPageSize());
         page.setCurrent(mgtMemberPageDto.getPageNum());
+        // 获取当前登陆人的可视权限
+        Long userId = SecurityUtils.getUserId();
+
         List<MgtMemberPageVo> mgtShopPageVoList = memberService.pageMgtMember(page,mgtMemberPageDto);
         return R.ok(page.setRecords(mgtShopPageVoList));
     }
 
     @RequestMapping(value = "/exportPageMgtMember", method = RequestMethod.POST)
     @ApiOperation(value = "导出会员列表")
-    public void exportPageMgtMember(@RequestBody MgtMemberPageDto mgtMemberPageDto, HttpServletResponse response) {
+    public void exportPageMgtMember(MgtMemberPageDto mgtMemberPageDto, HttpServletResponse response) {
         Page<MgtMemberPageVo> page = new Page<>();
-        page.setSize(2000);
-        page.setCurrent(1);
+        if(mgtMemberPageDto.getPageSize() > 5000){
+            page.setSize(5000);
+            page.setCurrent(1);
+        }else{
+            page.setSize(mgtMemberPageDto.getPageSize());
+            page.setCurrent(mgtMemberPageDto.getPageNum());
+        }
         List<MgtMemberPageVo> mgtShopPageVoList = memberService.pageMgtMember(page,mgtMemberPageDto);
         ExcelUtil<MgtMemberPageVo> util = new ExcelUtil<MgtMemberPageVo>(MgtMemberPageVo.class);
         util.exportExcel(response, mgtShopPageVoList, "用户管理");
     }
 
     @RequestMapping(value = "/editMemberRelationShop", method = RequestMethod.POST)
+    @Log(title = "会员管理", businessType = BusinessType.UPDATE,operContent = "修改会员关联商户")
     @ApiOperation(value = "修改会员关联商户")
     public R<MerMemberInfoVo> getMerMemberInfo(@RequestBody MgtMemberRelEditDto mgtMemberRelEditDto) {
         Long userId = SecurityUtils.getUserId();
@@ -79,6 +91,7 @@
     }
 
     @RequestMapping(value = "/deleteMemberRelationShop", method = RequestMethod.POST)
+    @Log(title = "会员管理", businessType = BusinessType.DELETE,operContent = "删除会员关联商户")
     @ApiOperation(value = "删除会员关联商户")
     public R<MerMemberInfoVo> deleteMemberRelationShop(@RequestBody MgtMemberRelDelDto mgtMemberRelDelDto) {
         Long userId = SecurityUtils.getUserId();
@@ -88,6 +101,7 @@
     }
 
     @RequestMapping(value = "/editMemberIntegral", method = RequestMethod.POST)
+    @Log(title = "会员管理", businessType = BusinessType.UPDATE,operContent = "修改会员积分")
     @ApiOperation(value = "修改会员积分")
     public R<MerMemberInfoVo> editMemberIntegral(@RequestBody MgtMemberIntEditDto mgtMemberIntEditDto) {
         Long userId = SecurityUtils.getUserId();
@@ -105,7 +119,12 @@
         return R.ok(mgtMemberGetVo);
     }
 
-
+    @RequestMapping(value = "/listMgtArchiveFields", method = RequestMethod.POST)
+    @ApiOperation(value = "平台获取档案字段")
+    public R<List<MgtArchiveFieldsListVo>> listMgtArchiveFields() {
+        List<MgtArchiveFieldsListVo> archiveFieldsListVoList = memberArchiveFieldsService.listMgtArchiveFields();
+        return R.ok(archiveFieldsListVoList);
+    }
 
     @RequestMapping(value = "/pageMgtMemberIntegral", method = RequestMethod.POST)
     @ApiOperation(value = "平台获取用户积分列表")
@@ -113,15 +132,20 @@
         Long userId = SecurityUtils.getUserId();
         mgtMemberIntegralPageDto.setUserId(userId);
         Page<MgtMemberIntegralPageVo> page = new Page<>();
-        page.setSize(2000);
-        page.setCurrent(1);
+        if(mgtMemberIntegralPageDto.getPageSize() > 5000){
+            page.setSize(5000);
+            page.setCurrent(1);
+        }else{
+            page.setSize(mgtMemberIntegralPageDto.getPageSize());
+            page.setCurrent(mgtMemberIntegralPageDto.getPageNum());
+        }
         List<MgtMemberIntegralPageVo> mgtMemberIntegralPageVoList = integralRecordService.pageMgtMemberIntegral(page,mgtMemberIntegralPageDto);
         return R.ok(page.setRecords(mgtMemberIntegralPageVoList));
     }
 
     @RequestMapping(value = "/exportPageMgtMemberIntegral", method = RequestMethod.POST)
     @ApiOperation(value = "导出用户积分列表")
-    public void exportPageMgtMemberIntegral(@RequestBody MgtMemberIntegralPageDto mgtMemberIntegralPageDto, HttpServletResponse response) {
+    public void exportPageMgtMemberIntegral( MgtMemberIntegralPageDto mgtMemberIntegralPageDto, HttpServletResponse response) {
         Long userId = SecurityUtils.getUserId();
         mgtMemberIntegralPageDto.setUserId(userId);
         Page<MgtMemberIntegralPageVo> page = new Page<>();
@@ -146,23 +170,39 @@
 
     @RequestMapping(value = "/exportPageMgtMemberBrowse", method = RequestMethod.POST)
     @ApiOperation(value = "导出用户浏览记录")
-    public void exportPageMgtMemberBrowse(@RequestBody MgtMemberBrowsePageDto mgtMemberBrowsePageDto, HttpServletResponse response) {
+    public void exportPageMgtMemberBrowse( MgtMemberBrowsePageDto mgtMemberBrowsePageDto, HttpServletResponse response) {
         Long userId = SecurityUtils.getUserId();
         mgtMemberBrowsePageDto.setUserId(userId);
         Page<MgtMemberBrowsePageVo> page = new Page<>();
-        page.setSize(2000);
-        page.setCurrent(1);
+        if(mgtMemberBrowsePageDto.getPageSize() > 5000){
+            page.setSize(5000);
+            page.setCurrent(1);
+        }else{
+            page.setSize(mgtMemberBrowsePageDto.getPageSize());
+            page.setCurrent(mgtMemberBrowsePageDto.getPageNum());
+        }
         List<MgtMemberBrowsePageVo> mgtMemberBrowsePageVoList = browseRecordService.pageMgtMemberBrowse(page,mgtMemberBrowsePageDto);
         ExcelUtil<MgtMemberBrowsePageVo> util = new ExcelUtil<MgtMemberBrowsePageVo>(MgtMemberBrowsePageVo.class);
         util.exportExcel(response, mgtMemberBrowsePageVoList, "用户浏览记录");
     }
 
     @RequestMapping(value = "/editMemberArchiveFields", method = RequestMethod.POST)
+    @Log(title = "会员管理", businessType = BusinessType.UPDATE,operContent = "编辑会员档案")
     @ApiOperation(value = "编辑会员档案")
     public R editMemberArchiveFields(@RequestBody MgtArchiveFieldsEditDto mgtArchiveFieldsEditDto) {
         Long userId = SecurityUtils.getUserId();
         mgtArchiveFieldsEditDto.setUserId(userId);
         memberArchiveFieldsService.editMemberArchiveFields(mgtArchiveFieldsEditDto);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/deleteMemberArchiveFields", method = RequestMethod.POST)
+    @Log(title = "会员管理", businessType = BusinessType.UPDATE,operContent = "删除会员档案")
+    @ApiOperation(value = "删除会员档案")
+    public R deleteMemberArchiveFields(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
+        Long userId = SecurityUtils.getUserId();
+        mgtBaseGetDto.setUserId(userId);
+        memberArchiveFieldsService.deleteMemberArchiveFields(mgtBaseGetDto);
         return R.ok();
     }
 
@@ -181,18 +221,24 @@
 
     @RequestMapping(value = "/exportPageMgtMemberSuggest", method = RequestMethod.POST)
     @ApiOperation(value = "导出用户建议列表")
-    public void exportPageMgtMemberSuggest(@RequestBody MgtMemberSuggestPageDto memberSuggestPageDto, HttpServletResponse response) {
+    public void exportPageMgtMemberSuggest( MgtMemberSuggestPageDto memberSuggestPageDto, HttpServletResponse response) {
         Long userId = SecurityUtils.getUserId();
         memberSuggestPageDto.setUserId(userId);
         Page<MgtMemberSuggestPageVo> page = new Page<>();
-        page.setSize(2000);
-        page.setCurrent(1);
+        if(memberSuggestPageDto.getPageSize() > 5000){
+            page.setSize(5000);
+            page.setCurrent(1);
+        }else{
+            page.setSize(memberSuggestPageDto.getPageSize());
+            page.setCurrent(memberSuggestPageDto.getPageNum());
+        }
         List<MgtMemberSuggestPageVo> mgtMemberSuggestPageVoList = memberSuggestService.pageMgtMemberSuggest(page,memberSuggestPageDto);
         ExcelUtil<MgtMemberSuggestPageVo> util = new ExcelUtil<MgtMemberSuggestPageVo>(MgtMemberSuggestPageVo.class);
         util.exportExcel(response, mgtMemberSuggestPageVoList, "用户建议列表");
     }
 
     @RequestMapping(value = "/mgtReplayMemberSuggest", method = RequestMethod.POST)
+    @Log(title = "会员建议管理", businessType = BusinessType.UPDATE,operContent = "回复会员建议")
     @ApiOperation(value = "平台回复会员建议")
     public R mgtReplayMemberSuggest(@RequestBody MgtReplayMemberSuggestDto mgtReplayMemberSuggestDto) {
         Long userId = SecurityUtils.getUserId();
@@ -210,6 +256,7 @@
     }
 
     @RequestMapping(value = "/mgtEditMemberSuggestTag", method = RequestMethod.POST)
+    @Log(title = "会员建议管理", businessType = BusinessType.UPDATE,operContent = "编辑会员建议标签")
     @ApiOperation(value = "平台编辑会员建议标签")
     public R mgtEditMemberSuggestTag(@RequestBody MgtTagMemberSuggestDto mgtTagMemberSuggestDto) {
         Long userId = SecurityUtils.getUserId();
@@ -218,5 +265,13 @@
         return R.ok();
     }
 
-
+    @RequestMapping(value = "/mgtFrozenMember", method = RequestMethod.POST)
+    @Log(title = "会员管理", businessType = BusinessType.UPDATE,operContent = "冻结会员")
+    @ApiOperation(value = "冻结会员")
+    public R mgtReplayMemberSuggest(@RequestBody MgtFrozenMemberDto mgtFrozenMemberDto) {
+        Long userId = SecurityUtils.getUserId();
+        mgtFrozenMemberDto.setUserId(userId);
+        memberService.mgtFrozenMember(mgtFrozenMemberDto);
+        return R.ok();
+    }
 }

--
Gitblit v1.7.1