From 452d17b1c16bfe8585c16bd82e67450abd97c82f Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期一, 14 七月 2025 17:57:25 +0800 Subject: [PATCH] 修改bug --- ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java | 16 ++++------------ 1 files changed, 4 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 6b4ecc0..06a34fc 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 @@ -53,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<>(); @@ -64,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) { @@ -114,11 +106,11 @@ @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); - return R.ok(); + Long aLong = memberService.addMerMember(merMemberAddDto); + return R.ok(aLong); } @RequestMapping(value = "/editMerMember", method = RequestMethod.POST) -- Gitblit v1.7.1