From 2cc5f6295aeba326b82deaf5f8bded61b9e1ae16 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 07 五月 2023 18:57:59 +0800
Subject: [PATCH] DEMO初步完成

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 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 0bcf8a1..ed80863 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
@@ -5,6 +5,7 @@
 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.vo.*;
 import com.ruoyi.member.service.member.MemberService;
 import com.ruoyi.system.api.domain.dto.MerBaseDto;
@@ -81,4 +82,19 @@
         return R.ok(merMemberBasicFileVo);
     }
 
+    @RequestMapping(value = "/getMerMemberTags", method = RequestMethod.POST)
+    @ApiOperation(value = "获取会员标签")
+    public R<List<MerMemberTagVo>> getMerMemberTags(@RequestBody MerBaseGetDto merBaseGetDto) {
+        Long userId = SecurityUtils.getUserId();
+        List<MerMemberTagVo> merMemberTagVoList = memberService.getMerMemberTags(Long.valueOf(merBaseGetDto.getId()));
+        return R.ok(merMemberTagVoList);
+    }
+
+    @RequestMapping(value = "/editMerMemberTags", method = RequestMethod.POST)
+    @ApiOperation(value = "编辑会员标签")
+    public R editMerMemberTags(@RequestBody MerMemberTagEditDto merMemberTagEditDto) {
+        Long userId = SecurityUtils.getUserId();
+        memberService.editMerMemberTags(merMemberTagEditDto);
+        return R.ok();
+    }
 }

--
Gitblit v1.7.1