From 61b5f9863f14ab4fc9da504ca2b553a778eb2e2c Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 24 一月 2024 15:10:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
index a28c80f..5d41084 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
@@ -167,9 +167,8 @@
* @return R<List<MgtSimpleMemberVo>>
*/
@PostMapping("/listSimpleVoByIds")
- public R<List<MgtSimpleMemberVo>> listSimpleVoByIds(@RequestBody MgtBaseBathDto mgtBaseBathDto)
- {
- List<MgtSimpleMemberVo> simpleMemberVoList = memberService.listSimpleVoByIds(mgtBaseBathDto.getIds());
+ public R<List<MgtSimpleMemberVo>> listSimpleVoByIds(@RequestBody String userIds)
+ {List<MgtSimpleMemberVo> simpleMemberVoList = memberService.listSimpleVoByIds(userIds);
return R.ok(simpleMemberVoList);
}
@@ -300,6 +299,20 @@
}
/**
+ * @description 核销奖品
+ * @author jqs
+ * @date 2023/8/10 11:56
+ * @param merVerifyPrizeFinalDto
+ * @return R
+ */
+ @PostMapping("/verifyPrize")
+ public R verifyPrize(@RequestBody MerVerifyPrizeFinalDto merVerifyPrizeFinalDto)
+ {
+ memberGiftRecordService.verifyPrize(merVerifyPrizeFinalDto);
+ return R.ok();
+ }
+
+ /**
* @description 积分变动
* @author jqs
* @date 2023/7/12 17:04
@@ -346,4 +359,10 @@
BirthdayCard birthdayCard = birthdayCardService.getBirthdayCard();
return R.ok(birthdayCard);
}
+
+ @PostMapping("/listUserIdByAgeType")
+ public R<List<Long>> listUserIdByAgeType(@RequestBody Integer ageType){
+ List<Long> userIdList = memberService.listUserIdByAgeType(ageType);
+ return R.ok(userIdList);
+ }
}
--
Gitblit v1.7.1