From ae41759bafec1c2a1e8858fcdcda4272ed4eb84c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 16 六月 2023 17:43:47 +0800
Subject: [PATCH] 联调bug和订单管理

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 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 b48f213..748c236 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,22 +3,18 @@
 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;
 import com.ruoyi.system.api.domain.dto.MerBaseGetDto;
-import com.ruoyi.system.api.domain.dto.MerPageDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -33,8 +29,9 @@
 @RequestMapping("/mer/member")
 public class MerMemberController {
 
-    @Autowired
+    @Resource
     private MemberService memberService;
+
 
 
     @RequestMapping(value = "/pageMerCashMember", method = RequestMethod.POST)
@@ -98,5 +95,21 @@
         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