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 | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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 748c236..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
@@ -5,6 +5,7 @@
import com.ruoyi.common.security.utils.SecurityUtils;
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.MerBaseGetDto;
import io.swagger.annotations.Api;
@@ -32,7 +33,8 @@
@Resource
private MemberService memberService;
-
+ @Resource
+ private MemberArchiveFieldsService memberArchiveFieldsService;
@RequestMapping(value = "/pageMerCashMember", method = RequestMethod.POST)
@ApiOperation(value = "分页获取收银搜索会员列表")
@@ -59,14 +61,17 @@
/**
- * 未完成
- * @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(@RequestBody MerBaseGetDto merBaseGetDto) {
Long userId = SecurityUtils.getUserId();
- MerMemberInfoVo merMemberInfo = memberService.getMerMemberInfo(Long.valueOf(merBaseGetDto.getId()));
+ MerMemberInfoVo merMemberInfo = memberService.getMerMemberInfo(merBaseGetDto);
return R.ok(merMemberInfo);
}
@@ -77,6 +82,13 @@
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)
@@ -112,4 +124,6 @@
memberService.editMerMember(merMemberAddDto);
return R.ok();
}
+
+
}
--
Gitblit v1.7.1