From fc39a04331e80226d50242ac1ec27f93494fb359 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 30 五月 2023 18:23:09 +0800
Subject: [PATCH] 用户管理
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 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..ac3fac6 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,17 @@
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.system.api.domain.dto.MgtBaseGetDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,7 +21,6 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
-import javax.annotation.Resource;
import java.util.List;
/**
@@ -34,7 +41,7 @@
@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 +49,45 @@
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);
+ }
+
+
+
+
+
}
--
Gitblit v1.7.1