From e858d188bcab66261b106907cdb8fbfdfe28460b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 七月 2025 15:17:58 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 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..c761dd2 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;
@@ -13,6 +14,7 @@
import com.ruoyi.system.api.domain.poji.member.MemberGiftRecord;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.vo.*;
+import com.ruoyi.system.api.model.AddIntegralRecordVo;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import com.ruoyi.system.api.service.RemoteShopService;
@@ -42,6 +44,9 @@
@Resource
private RemoteShopService remoteShopService;
+ @Resource
+ private LotteryEventClient lotteryEventClient;
+
/**
* @description: getMember
@@ -50,7 +55,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 +96,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);
@@ -393,8 +398,8 @@
* @return
*/
@PostMapping("/addIntegralRecord")
- public R addIntegralRecord(@RequestParam("integral") Integer integral, @RequestParam("userId") Long userId, @RequestParam("orderId") String orderId) {
- return memberService.addIntegralRecord(integral, userId, orderId);
+ public R addIntegralRecord(@RequestBody AddIntegralRecordVo addIntegralRecordVo) {
+ return memberService.addIntegralRecord(addIntegralRecordVo.getIntegral(), addIntegralRecordVo.getUserId(), addIntegralRecordVo.getOrderId());
}
@@ -409,4 +414,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