From ae41759bafec1c2a1e8858fcdcda4272ed4eb84c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 16 六月 2023 17:43:47 +0800
Subject: [PATCH] 联调bug和订单管理
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java | 99 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 87 insertions(+), 12 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..dfb24b3 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,24 +3,18 @@
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.service.member.MemberService;
-import com.ruoyi.system.api.domain.dto.MerBaseGetDto;
+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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -36,8 +30,20 @@
public class MgtMemberController {
- @Autowired
+ @Resource
private MemberService memberService;
+
+ @Resource
+ private IntegralRecordService integralRecordService;
+
+ @Resource
+ private BrowseRecordService browseRecordService;
+
+ @Resource
+ private MemberArchiveFieldsService memberArchiveFieldsService;
+
+ @Resource
+ private MemberSuggestService memberSuggestService;
@RequestMapping(value = "/pageMgtMember", method = RequestMethod.POST)
@@ -69,7 +75,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 +94,75 @@
+ @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));
+ }
+
+ @RequestMapping(value = "/editMemberArchiveFields", method = RequestMethod.POST)
+ @ApiOperation(value = "编辑会员档案")
+ public R editMemberArchiveFields(@RequestBody MgtArchiveFieldsEditDto mgtArchiveFieldsEditDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtArchiveFieldsEditDto.setUserId(userId);
+ 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 = "/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