From 08b2a4048452bef8d99ac5a700dd5aa6a4121699 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 30 六月 2023 18:04:14 +0800
Subject: [PATCH] 商户端会员和平台活动
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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..6b4ecc0 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;
@@ -35,6 +36,10 @@
@Resource
private MemberArchiveFieldsService memberArchiveFieldsService;
+
+ @Resource
+ private BrowseRecordService browseRecordService;
+
@RequestMapping(value = "/pageMerCashMember", method = RequestMethod.POST)
@ApiOperation(value = "分页获取收银搜索会员列表")
@@ -125,5 +130,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