From ed2a07a645dea3c1c3e52eec5cdfd58be0f4f75e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 30 六月 2025 16:31:31 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java | 2
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLotteryEventController.java | 3 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AppMiniRegisterVo.java | 6 +-
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 39 ++++++++++++++++---
ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java | 8 +++-
7 files changed, 47 insertions(+), 15 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AppMiniRegisterVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AppMiniRegisterVo.java
index 38f8a50..bc2cac7 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AppMiniRegisterVo.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AppMiniRegisterVo.java
@@ -19,13 +19,13 @@
@ApiModelProperty(value = "微信unionid")
private String unionid;
-
+
@ApiModelProperty(value = "微信昵称")
private String nickName;
-
+
@ApiModelProperty(value = "用户手机")
private String mobile;
-
+
@ApiModelProperty(value = "用户信息")
private SysUser sysUser;
}
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index f0aa831..1bf3dae 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -82,7 +82,7 @@
miniToken.put("lotteryDraw", true);
miniToken.put("lotteryEventId", data.get(0).getId());
}
- return R.ok();
+ return R.ok(miniToken);
}
@DeleteMapping("logout")
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLotteryEventController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLotteryEventController.java
index 49b5120..2a56d53 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLotteryEventController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLotteryEventController.java
@@ -55,6 +55,9 @@
@Resource
private GoodsService goodsService;
+
+// @Resource
+// private WxMaService wxMaService;
@RequestMapping(value = "/getShopLotteryDrawList", method = RequestMethod.POST)
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..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
@@ -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);
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java
index c44f2f0..652d5ec 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java
@@ -701,7 +701,7 @@
for (AppMemberPrizePageVo appMemberPrizePageVo : memberPrizePageVoList) {
Integer giftType = appMemberPrizePageVo.getGiftType();
String prizeFrom = appMemberPrizePageVo.getPrizeFrom();
- if ("抽奖".equals(prizeFrom) && (giftType == 2 || giftType == 4)) {
+ if ("抽奖".equals(prizeFrom) && (null != giftType && (giftType == 2 || giftType == 4))) {
appMemberPrizePageVo.setVerifyCode("3-" + appMemberPrizePageVo.getPrizeId());
}
if (appMemberPrizePageVo.getShopId() != null) {
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
index 1161275..3a21f6d 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -8,13 +8,18 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
+import com.ruoyi.common.core.constant.Constants;
+import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.JwtUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
+import com.ruoyi.common.core.utils.ip.IpUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.redis.service.RedisService;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.CodeFactoryUtil;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.member.domain.dto.*;
@@ -40,6 +45,7 @@
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
+import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.service.RemoteOrderService;
import com.ruoyi.system.api.service.RemoteShopService;
@@ -107,19 +113,20 @@
@Resource
private MemberArchiveService memberArchiveService;
-
+
@Resource
private RemoteShopService remoteShopService;
-
+
@Resource
private RemoteOrderService remoteOrderService;
-
+
@Resource
private RemoteUserService remoteUserService;
-
-
-
-
+
+ @Resource
+ private TokenService tokenService;
+
+
/**
* @description: TODO
* @author jqs34
@@ -287,6 +294,24 @@
appUserRegisterVo.setOpenid(member.getMiniOpenid());
appUserRegisterVo.setUnionid(member.getWxUnionid());
appUserRegisterVo.setSysUser(sysUser);
+
+ LoginUser loginUser = new LoginUser();
+ // Jwt存储信息
+ Map<String, Object> claimsMap = new HashMap<String, Object>();
+ loginUser.setSysUser(sysUser);
+ String token = IdUtils.fastUUID();
+ Long userId = loginUser.getSysUser().getUserId();
+ String userName = loginUser.getSysUser().getUserName();
+ loginUser.setToken(token);
+ loginUser.setUserid(userId);
+ loginUser.setUsername(userName);
+ loginUser.setIpaddr(IpUtils.getIpAddr());
+ tokenService.refreshToken(loginUser);
+ claimsMap.put(SecurityConstants.USER_KEY, token);
+ claimsMap.put(SecurityConstants.DETAILS_USER_ID, userId);
+ claimsMap.put(SecurityConstants.DETAILS_USERNAME, userName);
+ claimsMap.put(SecurityConstants.LOGIN_FROM, Constants.FROM_MINI_APP);
+ appUserRegisterVo.setToken(JwtUtils.createToken(claimsMap));
return appUserRegisterVo;
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml
index 0a117ad..5ae8062 100644
--- a/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml
@@ -16,7 +16,7 @@
# 服务注册地址
# server-addr: 47.109.78.184:5000
server-addr: 192.168.110.80:8848
- ip: 192.168.110.21
+ ip: 192.168.110.85
#pro
# namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
# test
--
Gitblit v1.7.1