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 | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 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 396bcf7..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,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.BrowseRecordService;
import com.ruoyi.member.service.member.MemberArchiveFieldsService;
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.system.api.domain.dto.MerBaseGetDto;
@@ -36,6 +37,10 @@
@Resource
private MemberArchiveFieldsService memberArchiveFieldsService;
+ @Resource
+ private BrowseRecordService browseRecordService;
+
+
@RequestMapping(value = "/pageMerCashMember", method = RequestMethod.POST)
@ApiOperation(value = "分页获取收银搜索会员列表")
public R<Page<MerCashMemberPageVo>> pageMerCashMember(@RequestBody MerCashMemberPageDto merCashMemberPageDto) {
@@ -48,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<>();
@@ -59,14 +64,6 @@
}
-
- /**
- * @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) {
@@ -109,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);
@@ -125,5 +122,15 @@
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