From cbc564a7088503ad8cc7af4e1d2ba417d061e615 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 30 六月 2023 11:35:05 +0800
Subject: [PATCH] 联调bug和统计完善
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java | 97 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 94 insertions(+), 3 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 864c5c2..1e222f7 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
@@ -2,6 +2,9 @@
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.*;
@@ -15,6 +18,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -56,7 +60,19 @@
return R.ok(page.setRecords(mgtShopPageVoList));
}
+ @RequestMapping(value = "/exportPageMgtMember", method = RequestMethod.POST)
+ @ApiOperation(value = "导出会员列表")
+ public void exportPageMgtMember(@RequestBody MgtMemberPageDto mgtMemberPageDto, HttpServletResponse response) {
+ Page<MgtMemberPageVo> page = new Page<>();
+ page.setSize(2000);
+ page.setCurrent(1);
+ 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();
@@ -66,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();
@@ -75,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();
@@ -92,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 = "平台获取用户积分列表")
@@ -100,10 +123,23 @@
Long userId = SecurityUtils.getUserId();
mgtMemberIntegralPageDto.setUserId(userId);
Page<MgtMemberIntegralPageVo> page = new Page<>();
+ page.setSize(2000);
+ page.setCurrent(1);
+ 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) {
+ 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));
+ ExcelUtil<MgtMemberIntegralPageVo> util = new ExcelUtil<MgtMemberIntegralPageVo>(MgtMemberIntegralPageVo.class);
+ util.exportExcel(response, mgtMemberIntegralPageVoList, "用户积分列表");
}
@RequestMapping(value = "/pageMgtMemberBrowse", method = RequestMethod.POST)
@@ -118,7 +154,21 @@
return R.ok(page.setRecords(mgtMemberBrowsePageVoList));
}
+ @RequestMapping(value = "/exportPageMgtMemberBrowse", method = RequestMethod.POST)
+ @ApiOperation(value = "导出用户浏览记录")
+ public void exportPageMgtMemberBrowse(@RequestBody MgtMemberBrowsePageDto mgtMemberBrowsePageDto, HttpServletResponse response) {
+ Long userId = SecurityUtils.getUserId();
+ mgtMemberBrowsePageDto.setUserId(userId);
+ Page<MgtMemberBrowsePageVo> page = new Page<>();
+ page.setSize(2000);
+ page.setCurrent(1);
+ 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();
@@ -129,7 +179,7 @@
@RequestMapping(value = "/pageMgtMemberSuggest", method = RequestMethod.POST)
- @ApiOperation(value = "平台获取用户建议")
+ @ApiOperation(value = "平台获取用户建议列表")
public R<Page<MgtMemberSuggestPageVo>> pageMgtMemberSuggest(@RequestBody MgtMemberSuggestPageDto memberSuggestPageDto) {
Long userId = SecurityUtils.getUserId();
memberSuggestPageDto.setUserId(userId);
@@ -140,5 +190,46 @@
return R.ok(page.setRecords(mgtMemberSuggestPageVoList));
}
+ @RequestMapping(value = "/exportPageMgtMemberSuggest", method = RequestMethod.POST)
+ @ApiOperation(value = "导出用户建议列表")
+ public void exportPageMgtMemberSuggest(@RequestBody MgtMemberSuggestPageDto memberSuggestPageDto, HttpServletResponse response) {
+ Long userId = SecurityUtils.getUserId();
+ memberSuggestPageDto.setUserId(userId);
+ Page<MgtMemberSuggestPageVo> page = new Page<>();
+ page.setSize(2000);
+ page.setCurrent(1);
+ 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();
+ mgtReplayMemberSuggestDto.setUserId(userId);
+ memberSuggestService.mgtReplayMemberSuggest(mgtReplayMemberSuggestDto);
+ return R.ok();
+ }
+
+
+ @RequestMapping(value = "/listMgtMemberSuggestTag", method = RequestMethod.POST)
+ @ApiOperation(value = "获取会员建议标签")
+ public R<List<MgtMemberSuggestTagVo>> listMgtMemberSuggestTag(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
+ List<MgtMemberSuggestTagVo> mgtMemberSuggestTagVoList = memberSuggestService.listMgtMemberSuggestTag(Long.valueOf(mgtBaseGetDto.getId()));
+ return R.ok(mgtMemberSuggestTagVoList);
+ }
+
+ @RequestMapping(value = "/mgtEditMemberSuggestTag", method = RequestMethod.POST)
+ @Log(title = "会员建议管理", businessType = BusinessType.UPDATE,operContent = "编辑会员建议标签")
+ @ApiOperation(value = "平台编辑会员建议标签")
+ public R mgtEditMemberSuggestTag(@RequestBody MgtTagMemberSuggestDto mgtTagMemberSuggestDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtTagMemberSuggestDto.setUserId(userId);
+ memberSuggestService.mgtEditMemberSuggestTag(mgtTagMemberSuggestDto);
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1