From 1772afb069b75871572c9c438bbd2bc403f864df Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 13 十二月 2023 11:43:51 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 5 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 c6da197..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
@@ -2,17 +2,22 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.member.service.birthday.BirthdayCardService;
import com.ruoyi.member.service.member.MemberGiftRecordService;
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.member.service.member.MemberSuggestService;
import com.ruoyi.system.api.domain.dto.*;
+import com.ruoyi.system.api.domain.poji.member.BirthdayCard;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.member.MemberGiftRecord;
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
@@ -29,6 +34,9 @@
@Resource
private MemberGiftRecordService memberGiftRecordService;
+
+ @Resource
+ private BirthdayCardService birthdayCardService;
/**
* @description: getMember
@@ -159,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);
}
@@ -292,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
@@ -299,7 +320,7 @@
* @return R
*/
@PostMapping("/changeIntegral")
- public R signShare(@RequestBody IntegralChangeDto integralChangeDto) {
+ public R changeIntegral(@RequestBody IntegralChangeDto integralChangeDto) {
memberService.changeIntegral(integralChangeDto);
return R.ok();
}
@@ -317,4 +338,31 @@
Integer count = memberService.getAreaNewMember(shopIdList);
return R.ok(count);
}
+
+
+ /**
+ * @description 更新会员绑定商户名
+ * @author jqs
+ * @date 2023/7/26 17:07
+ * @param mgtMemberShopNameDto
+ * @return R
+ */
+ @PostMapping("/updateMemberShopName")
+ public R updateMemberShopName(@RequestBody MgtMemberShopNameDto mgtMemberShopNameDto) {
+ memberService.updateMemberShopName(mgtMemberShopNameDto);
+ return R.ok();
+ }
+
+ @PostMapping("/getBirthdayCard")
+ public R<BirthdayCard> getBirthdayCard()
+ {
+ 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