From 39be10f603a0f8cb2e1a69ea8a1f5f8cb83303ff Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 29 五月 2023 17:19:20 +0800
Subject: [PATCH] 微调
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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..143a468 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,12 @@
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.MgtMemberPageDto;
+import com.ruoyi.member.domain.vo.MerMemberInfoVo;
import com.ruoyi.member.domain.vo.MgtMemberPageVo;
import com.ruoyi.member.service.member.MemberService;
+import com.ruoyi.system.api.domain.dto.MerBaseGetDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +37,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 +45,12 @@
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 MerBaseGetDto merBaseGetDto) {
+ Long userId = SecurityUtils.getUserId();
+ MerMemberInfoVo merMemberInfo = memberService.getMerMemberInfo(Long.valueOf(merBaseGetDto.getId()));
+ return R.ok(merMemberInfo);
+ }
}
--
Gitblit v1.7.1