From b4882b114f082e010d4cc3359d78d18095ef3b83 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 26 六月 2023 19:49:38 +0800
Subject: [PATCH] 商户端和管理台联调bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java | 104 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 99 insertions(+), 5 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 780126d..45f7f60 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,13 +2,11 @@
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.security.utils.SecurityUtils;
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.MemberArchiveFieldsService;
-import com.ruoyi.member.service.member.MemberService;
+import com.ruoyi.member.service.member.*;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -18,6 +16,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -45,6 +44,10 @@
@Resource
private MemberArchiveFieldsService memberArchiveFieldsService;
+ @Resource
+ private MemberSuggestService memberSuggestService;
+
+
@RequestMapping(value = "/pageMgtMember", method = RequestMethod.POST)
@ApiOperation(value = "分页获取会员列表")
public R<Page<MgtMemberPageVo>> pageMgtMember(@RequestBody MgtMemberPageDto mgtMemberPageDto) {
@@ -53,6 +56,17 @@
page.setCurrent(mgtMemberPageDto.getPageNum());
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) {
+ 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)
@@ -99,10 +113,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)
@@ -117,6 +144,19 @@
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)
@ApiOperation(value = "编辑会员档案")
public R editMemberArchiveFields(@RequestBody MgtArchiveFieldsEditDto mgtArchiveFieldsEditDto) {
@@ -125,4 +165,58 @@
memberArchiveFieldsService.editMemberArchiveFields(mgtArchiveFieldsEditDto);
return R.ok();
}
+
+
+ @RequestMapping(value = "/pageMgtMemberSuggest", method = RequestMethod.POST)
+ @ApiOperation(value = "平台获取用户建议列表")
+ public R<Page<MgtMemberSuggestPageVo>> pageMgtMemberSuggest(@RequestBody MgtMemberSuggestPageDto memberSuggestPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ memberSuggestPageDto.setUserId(userId);
+ Page<MgtMemberSuggestPageVo> page = new Page<>();
+ page.setSize(memberSuggestPageDto.getPageSize());
+ page.setCurrent(memberSuggestPageDto.getPageNum());
+ List<MgtMemberSuggestPageVo> mgtMemberSuggestPageVoList = memberSuggestService.pageMgtMemberSuggest(page,memberSuggestPageDto);
+ 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)
+ @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)
+ @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