From 916ff14278f99378758272784a00abee12a4f126 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 30 六月 2025 16:48:42 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 c9af95a..4e62a27 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.goods.api.service.LotteryEventClient;
import com.ruoyi.member.service.birthday.BirthdayCardService;
import com.ruoyi.member.service.member.MemberGiftRecordService;
import com.ruoyi.member.service.member.MemberService;
@@ -42,6 +43,9 @@
@Resource
private RemoteShopService remoteShopService;
+ @Resource
+ private LotteryEventClient lotteryEventClient;
+
/**
* @description: getMember
@@ -60,6 +64,20 @@
return R.ok(member);
}
+
+ /**
+ * 修改会员数据
+ *
+ * @param member
+ * @return
+ */
+ @PostMapping("/editMember")
+ public R editMember(@RequestBody Member member) {
+ memberService.updateById(member);
+ return R.ok();
+ }
+
+
/**
* 小程序登录
*/
@@ -77,7 +95,7 @@
@ApiOperation(value = "小程序注册")
public R<AppMiniRegisterVo> miniRegister(@RequestBody AppMiniRegisterDto appUserRegisterDto) {
AppMiniRegisterVo appUserRegisterVo = memberService.miniRegister(appUserRegisterDto);
- if(appUserRegisterVo ==null){
+ if (appUserRegisterVo == null) {
return R.fail("注册失败！");
}
return R.ok(appUserRegisterVo);
--
Gitblit v1.7.1