From f5d3adf884a49cb8f4563be0c7086a506011d64d Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 26 八月 2023 14:35:47 +0800
Subject: [PATCH] 修改订单查询
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java | 99 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 90 insertions(+), 9 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 a08716e..52522ae 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,20 +3,20 @@
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.MerMemberPageDto;
-import com.ruoyi.member.domain.vo.AppUserInfoVo;
-import com.ruoyi.member.domain.vo.MerMemberInfoVo;
-import com.ruoyi.member.domain.vo.MerMemberPageVo;
+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.MerPageDto;
+import com.ruoyi.system.api.domain.dto.MerBaseGetDto;
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,26 @@
@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)
+ @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 = "分页获取商户绑定会员列表")
@@ -45,11 +63,74 @@
return R.ok(page.setRecords(merMemberPageVoList));
}
+
@RequestMapping(value = "/getMerMemberInfo", method = RequestMethod.POST)
@ApiOperation(value = "获取会员信息")
- public R<MerMemberInfoVo> getMerMemberInfo() {
+ public R<MerMemberInfoVo> getMerMemberInfo(@RequestBody MerBaseGetDto merBaseGetDto) {
Long userId = SecurityUtils.getUserId();
- MerMemberInfoVo merMemberInfo = memberService.getMerMemberInfo(userId);
+ MerMemberInfoVo merMemberInfo = memberService.getMerMemberInfo(merBaseGetDto);
return R.ok(merMemberInfo);
}
+
+
+ @RequestMapping(value = "/getMerMemberBasicFile", method = RequestMethod.POST)
+ @ApiOperation(value = "获取会员基础档案")
+ public R<MerMemberBasicFileVo> getMerMemberBasicFile(@RequestBody MerBaseGetDto merBaseGetDto) {
+ 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)
+ @ApiOperation(value = "获取会员标签")
+ public R<List<MerMemberTagVo>> getMerMemberTags(@RequestBody MerBaseGetDto merBaseGetDto) {
+ Long userId = SecurityUtils.getUserId();
+ List<MerMemberTagVo> merMemberTagVoList = memberService.getMerMemberTags(Long.valueOf(merBaseGetDto.getId()));
+ return R.ok(merMemberTagVoList);
+ }
+
+ @RequestMapping(value = "/editMerMemberTags", method = RequestMethod.POST)
+ @ApiOperation(value = "编辑会员标签")
+ public R editMerMemberTags(@RequestBody MerMemberTagEditDto merMemberTagEditDto) {
+ Long userId = SecurityUtils.getUserId();
+ memberService.editMerMemberTags(merMemberTagEditDto);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/addMerMember", method = RequestMethod.POST)
+ @ApiOperation(value = "新增会员")
+ public R<Long> addMerMember(@RequestBody MerMemberAddDto merMemberAddDto) {
+ Long userId = SecurityUtils.getUserId();
+ merMemberAddDto.setUserId(userId);
+ memberService.addMerMember(merMemberAddDto);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/editMerMember", method = RequestMethod.POST)
+ @ApiOperation(value = "编辑会员")
+ public R editMerMember(@RequestBody MerMemberEditDto merMemberAddDto) {
+ Long userId = SecurityUtils.getUserId();
+ merMemberAddDto.setUserId(userId);
+ 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