From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 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 ed6f4b5..2e804c8 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,18 +5,18 @@
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.BrowseRecordService;
+import com.ruoyi.member.service.member.MemberArchiveFieldsService;
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;
/**
@@ -31,8 +31,14 @@
@RequestMapping("/mer/member")
public class MerMemberController {
- @Autowired
+ @Resource
private MemberService memberService;
+
+ @Resource
+ private MemberArchiveFieldsService memberArchiveFieldsService;
+
+ @Resource
+ private BrowseRecordService browseRecordService;
@RequestMapping(value = "/pageMerCashMember", method = RequestMethod.POST)
@@ -47,7 +53,7 @@
}
@RequestMapping(value = "/pageMerMember", method = RequestMethod.POST)
- @ApiOperation(value = "分页获取商户绑定会员列表")
+ @ApiOperation(value = "分页获取商户绑定会员列表【2.0】")
public R<Page<MerMemberPageVo>> pageMerMember(@RequestBody MerMemberPageDto merMemberPageDto) {
Long userId = SecurityUtils.getUserId();
Page<MerMemberPageVo> page = new Page<>();
@@ -58,16 +64,11 @@
}
-
- /**
- * 未完成
- * @return
- */
@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);
}
@@ -78,6 +79,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)
@@ -98,7 +106,7 @@
@RequestMapping(value = "/addMerMember", method = RequestMethod.POST)
@ApiOperation(value = "新增会员")
- public R addMerMember(@RequestBody MerMemberAddDto merMemberAddDto) {
+ public R<Long> addMerMember(@RequestBody MerMemberAddDto merMemberAddDto) {
Long userId = SecurityUtils.getUserId();
merMemberAddDto.setUserId(userId);
memberService.addMerMember(merMemberAddDto);
@@ -113,4 +121,16 @@
memberService.editMerMember(merMemberAddDto);
return R.ok();
}
+
+ @RequestMapping(value = "/pageMerMemberBrowse", method = RequestMethod.POST)
+ @ApiOperation(value = "商户获取用户浏览记录")
+ public R<Page<MerMemberBrowsePageVo>> pageMerMemberBrowse(@RequestBody MerMemberBrowsePageDto merMemberBrowsePageDto) {
+ Long userId = SecurityUtils.getUserId();
+ merMemberBrowsePageDto.setUserId(userId);
+ Page<MerMemberBrowsePageVo> page = new Page<>();
+ page.setSize(merMemberBrowsePageDto.getPageSize());
+ page.setCurrent(merMemberBrowsePageDto.getPageNum());
+ List<MerMemberBrowsePageVo> memberBrowsePageVoList = browseRecordService.pageMerMemberBrowse(page,merMemberBrowsePageDto);
+ return R.ok(page.setRecords(memberBrowsePageVoList));
+ }
}
--
Gitblit v1.7.1