From 65816321c28dab1f43d0563af67dbcbad2c5bdca Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 22 五月 2023 18:15:39 +0800
Subject: [PATCH] demo补完

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java
index ed80863..ed6f4b5 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java
@@ -3,9 +3,7 @@
 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.MerCashMemberPageDto;
-import com.ruoyi.member.domain.dto.MerMemberPageDto;
-import com.ruoyi.member.domain.dto.MerMemberTagEditDto;
+import com.ruoyi.member.domain.dto.*;
 import com.ruoyi.member.domain.vo.*;
 import com.ruoyi.member.service.member.MemberService;
 import com.ruoyi.system.api.domain.dto.MerBaseDto;
@@ -97,4 +95,22 @@
         memberService.editMerMemberTags(merMemberTagEditDto);
         return R.ok();
     }
+
+    @RequestMapping(value = "/addMerMember", method = RequestMethod.POST)
+    @ApiOperation(value = "新增会员")
+    public R addMerMember(@RequestBody MerMemberAddDto merMemberAddDto) {
+        Long userId = SecurityUtils.getUserId();
+        merMemberAddDto.setUserId(userId);
+        memberService.addMerMember(merMemberAddDto);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/editMerMember", method = RequestMethod.POST)
+    @ApiOperation(value = "编辑会员")
+    public R editMerMember(@RequestBody MerMemberEditDto merMemberAddDto) {
+        Long userId = SecurityUtils.getUserId();
+        merMemberAddDto.setUserId(userId);
+        memberService.editMerMember(merMemberAddDto);
+        return R.ok();
+    }
 }

--
Gitblit v1.7.1