From fab844ecb6ff7c55a625b54e5481e0a2ab13abff Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 01 六月 2023 18:11:52 +0800
Subject: [PATCH] 商户管理

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java |   81 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 77 insertions(+), 4 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 c7250a9..210bea9 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,9 +2,14 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.member.domain.dto.MgtMemberPageDto;
-import com.ruoyi.member.domain.vo.MgtMemberPageVo;
+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.system.api.domain.dto.MgtBaseGetDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,7 +18,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -32,9 +36,14 @@
     @Autowired
     private MemberService memberService;
 
+    @Autowired
+    private IntegralRecordService integralRecordService;
+
+    @Autowired
+    private BrowseRecordService browseRecordService;
 
     @RequestMapping(value = "/pageMgtMember", method = RequestMethod.POST)
-    @ApiOperation(value = "分页获取用户列表")
+    @ApiOperation(value = "分页获取会员列表")
     public R<Page<MgtMemberPageVo>> pageMgtMember(@RequestBody MgtMemberPageDto mgtMemberPageDto) {
         Page<MgtMemberPageVo> page = new Page<>();
         page.setSize(mgtMemberPageDto.getPageSize());
@@ -42,4 +51,68 @@
         List<MgtMemberPageVo> mgtShopPageVoList = memberService.pageMgtMember(page,mgtMemberPageDto);
         return R.ok(page.setRecords(mgtShopPageVoList));
     }
+
+    @RequestMapping(value = "/editMemberRelationShop", method = RequestMethod.POST)
+    @ApiOperation(value = "修改会员关联商户")
+    public R<MerMemberInfoVo> getMerMemberInfo(@RequestBody MgtMemberRelEditDto mgtMemberRelEditDto) {
+        Long userId = SecurityUtils.getUserId();
+        mgtMemberRelEditDto.setUserId(userId);
+        memberService.editMemberRelationShop(mgtMemberRelEditDto);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/deleteMemberRelationShop", method = RequestMethod.POST)
+    @ApiOperation(value = "删除会员关联商户")
+    public R<MerMemberInfoVo> deleteMemberRelationShop(@RequestBody MgtMemberRelDelDto mgtMemberRelDelDto) {
+        Long userId = SecurityUtils.getUserId();
+        mgtMemberRelDelDto.setUserId(userId);
+        memberService.deleteMemberRelationShop(mgtMemberRelDelDto);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/editMemberIntegral", method = RequestMethod.POST)
+    @ApiOperation(value = "修改会员积分")
+    public R<MerMemberInfoVo> editMemberIntegral(@RequestBody MgtMemberIntEditDto mgtMemberIntEditDto) {
+        Long userId = SecurityUtils.getUserId();
+        mgtMemberIntEditDto.setUserId(userId);
+        memberService.editMemberIntegral(mgtMemberIntEditDto);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/getMgtMemberInfo", method = RequestMethod.POST)
+    @ApiOperation(value = "获取会员信息")
+    public R<MgtMemberGetVo> getMgtMemberInfo(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
+        Long userId = SecurityUtils.getUserId();
+        mgtBaseGetDto.setUserId(userId);
+        MgtMemberGetVo mgtMemberGetVo = memberService.getMgtMemberInfo(Long.valueOf(mgtBaseGetDto.getId()));
+        return R.ok(mgtMemberGetVo);
+    }
+
+
+
+    @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));
+    }
+
+
 }

--
Gitblit v1.7.1