From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 84b8c1b..69dcf2d 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
@@ -50,7 +54,7 @@
* @author jqs34
* @date: 2023/4/30 12:49
*/
-
+
@PostMapping("/getMember")
public R<Member> getMember(@RequestBody Long userId) {
Member member = memberService.getByUserId(userId);
@@ -91,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);
@@ -409,4 +413,17 @@
memberGiftRecordService.save(memberGiftRecord);
return R.ok();
}
+
+
+ /**
+ * 获取微信二维码
+ *
+ * @param scene
+ * @param path
+ * @return
+ */
+ @PostMapping("/getWeiXinQrCode")
+ public String getWeiXinQrCode(@RequestParam("scene") String scene, @RequestParam("path") String path) {
+ return memberService.getWeiXinQrCode(scene, path);
+ }
}
--
Gitblit v1.7.1