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-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 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..46c72b7 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,6 +3,8 @@
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.*;
@@ -60,7 +62,7 @@
@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);
@@ -70,6 +72,7 @@
}
@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 +82,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 +92,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 +110,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 = "平台获取用户积分列表")
@@ -121,7 +131,7 @@
@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,7 +156,7 @@
@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<>();
@@ -158,11 +168,22 @@
}
@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,7 +202,7 @@
@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<>();
@@ -193,6 +214,7 @@
}
@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 +232,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 +241,13 @@
return R.ok();
}
-
+ @RequestMapping(value = "/mgtFrozenMember", method = RequestMethod.POST)
+ @Log(title = "会员建议管理", businessType = BusinessType.UPDATE,operContent = "冻结会员")
+ @ApiOperation(value = "冻结会员")
+ public R mgtReplayMemberSuggest(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtBaseGetDto.setUserId(userId);
+ memberService.mgtFrozenMember(mgtBaseGetDto);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1