From 43d9975c99cb947b4602f05bc2e513a20de92c38 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 06 五月 2023 20:30:42 +0800
Subject: [PATCH] 商户端主流程
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 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 376a758..751b09d 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,8 +3,11 @@
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.service.member.MemberService;
import com.ruoyi.system.api.domain.dto.MerPageDto;
@@ -33,6 +36,18 @@
@Autowired
private MemberService memberService;
+
+ @RequestMapping(value = "/pageMerCashMember", method = RequestMethod.POST)
+ @ApiOperation(value = "分页获取收银搜索会员列表")
+ public R<Page<MerCashMemberPageVo>> pageMerCashMember(@RequestBody MerCashMemberPageDto merCashMemberPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ Page<MerCashMemberPageVo> page = new Page<>();
+ page.setSize(merCashMemberPageDto.getPageSize());
+ page.setCurrent(merCashMemberPageDto.getPageNum());
+ List<MerCashMemberPageVo> merCashMemberPageVos = memberService.pageMerCashMember(page,merCashMemberPageDto);
+ return R.ok(page.setRecords(merCashMemberPageVos));
+ }
+
@RequestMapping(value = "/pageMerMember", method = RequestMethod.POST)
@ApiOperation(value = "分页获取商户绑定会员列表")
public R<Page<MerMemberPageVo>> pageMerMember(@RequestBody MerMemberPageDto merMemberPageDto) {
@@ -44,11 +59,19 @@
return R.ok(page.setRecords(merMemberPageVoList));
}
+
+
+ /**
+ * 未完成
+ * @return
+ */
@RequestMapping(value = "/getMerMemberInfo", method = RequestMethod.POST)
@ApiOperation(value = "获取会员信息")
- public R<AppUserInfoVo> getAppUserInfo() {
+ public R<MerMemberInfoVo> getMerMemberInfo() {
Long userId = SecurityUtils.getUserId();
- AppUserInfoVo appUserInfoVo = memberService.getAppUserInfo(userId);
- return R.ok(appUserInfoVo);
+ MerMemberInfoVo merMemberInfo = memberService.getMerMemberInfo(userId);
+ return R.ok(merMemberInfo);
}
+
+
}
--
Gitblit v1.7.1