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 |   66 +++++++++++++++++++++++++++++----
 1 files changed, 58 insertions(+), 8 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 210bea9..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
@@ -5,19 +5,16 @@
 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.MemberService;
-import com.ruoyi.system.api.domain.dto.MerBaseGetDto;
+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;
 
 /**
@@ -33,14 +30,21 @@
 public class MgtMemberController {
 
 
-    @Autowired
+    @Resource
     private MemberService memberService;
 
-    @Autowired
+    @Resource
     private IntegralRecordService integralRecordService;
 
-    @Autowired
+    @Resource
     private BrowseRecordService browseRecordService;
+
+    @Resource
+    private MemberArchiveFieldsService memberArchiveFieldsService;
+
+    @Resource
+    private MemberSuggestService memberSuggestService;
+
 
     @RequestMapping(value = "/pageMgtMember", method = RequestMethod.POST)
     @ApiOperation(value = "分页获取会员列表")
@@ -114,5 +118,51 @@
         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