From cbc564a7088503ad8cc7af4e1d2ba417d061e615 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 30 六月 2023 11:35:05 +0800
Subject: [PATCH] 联调bug和统计完善

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java |   80 +++++++++++++++++++++++++++++++++------
 1 files changed, 67 insertions(+), 13 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 17a4f67..396bcf7 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,19 @@
 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.vo.AppUserInfoVo;
-import com.ruoyi.member.domain.vo.MerCashMemberPageVo;
-import com.ruoyi.member.domain.vo.MerMemberInfoVo;
-import com.ruoyi.member.domain.vo.MerMemberPageVo;
+import com.ruoyi.member.domain.dto.*;
+import com.ruoyi.member.domain.vo.*;
+import com.ruoyi.member.service.member.MemberArchiveFieldsService;
 import com.ruoyi.member.service.member.MemberService;
-import com.ruoyi.system.api.domain.dto.MerPageDto;
+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;
 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,9 +30,11 @@
 @RequestMapping("/mer/member")
 public class MerMemberController {
 
-    @Autowired
+    @Resource
     private MemberService memberService;
 
+    @Resource
+    private MemberArchiveFieldsService memberArchiveFieldsService;
 
     @RequestMapping(value = "/pageMerCashMember", method = RequestMethod.POST)
     @ApiOperation(value = "分页获取收银搜索会员列表")
@@ -62,14 +61,69 @@
 
 
     /**
-     * 未完成
-     * @return
+     * @description  获取会员信息
+     * @author  jqs
+     * @date    2023/6/29 18:10
+     * @param merBaseGetDto
+     * @return  R<MerMemberInfoVo>
      */
     @RequestMapping(value = "/getMerMemberInfo", method = RequestMethod.POST)
     @ApiOperation(value = "获取会员信息")
-    public R<MerMemberInfoVo> getMerMemberInfo() {
+    public R<MerMemberInfoVo> getMerMemberInfo(@RequestBody MerBaseGetDto merBaseGetDto) {
         Long userId = SecurityUtils.getUserId();
-        MerMemberInfoVo merMemberInfo = memberService.getMerMemberInfo(userId);
+        MerMemberInfoVo merMemberInfo = memberService.getMerMemberInfo(merBaseGetDto);
         return R.ok(merMemberInfo);
     }
+
+
+    @RequestMapping(value = "/getMerMemberBasicFile", method = RequestMethod.POST)
+    @ApiOperation(value = "获取会员基础档案")
+    public R<MerMemberBasicFileVo> getMerMemberBasicFile(@RequestBody MerBaseGetDto merBaseGetDto) {
+        Long userId = SecurityUtils.getUserId();
+        MerMemberBasicFileVo merMemberBasicFileVo = memberService.getMerMemberBasicFile(Long.valueOf(merBaseGetDto.getId()));
+        return R.ok(merMemberBasicFileVo);
+    }
+
+    @RequestMapping(value = "/listMerArchiveFields", method = RequestMethod.POST)
+    @ApiOperation(value = "商户获取档案字段")
+    public R<List<MgtArchiveFieldsListVo>> listMerArchiveFields() {
+        List<MgtArchiveFieldsListVo> archiveFieldsListVoList = memberArchiveFieldsService.listMgtArchiveFields();
+        return R.ok(archiveFieldsListVoList);
+    }
+
+    @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();
+    }
+
+    @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