Commit 21c629da by fanjiaxin

联调问题处理

parent 03364e3e
Pipeline #71583 passed with stages
in 1 minute 2 seconds
......@@ -34,6 +34,26 @@ public class LoginUserHelper {
/**
* 保存用户认证信息
*/
public LoginUserInfo setLoginUserInfo(String token, String sharerAppId) {
LoginUserInfo loginUserInfo = getLoginUserInfo(token);
loginUserInfo.setSharerAppId(sharerAppId);
setLoginUserInfo(token, loginUserInfo);
return loginUserInfo;
}
/**
* 保存用户认证信息
*/
public LoginUserInfo setLoginUserInfo(String token, String openId, String sharerAppId) {
LoginUserInfo loginUserInfo = LoginUserInfo.builder()
.accessToken(token).openId(openId).sharerAppId(sharerAppId).build();
setLoginUserInfo(token, loginUserInfo);
return loginUserInfo;
}
/**
* 保存用户认证信息
*/
public void setLoginUserInfo(String token, LoginUserInfo loginUserInfo) {
redisClient.setStr(CoreConstant.REDIS_TOKEN_USER_KEY + token,
JSON.toJSONString(loginUserInfo), CoreConstant.REDIS_TOKEN_EXPIRE_SECONDS);
......
package com.netease.yanxuan.wx.store.sharer.biz.core;
import lombok.Builder;
import lombok.Data;
import java.io.Serializable;
......@@ -10,6 +11,7 @@ import java.io.Serializable;
* @Date 2025/3/10 11:04
*/
@Data
@Builder
public class LoginUserInfo implements Serializable{
private static final long serialVersionUID = 3375070827863778256L;
......
......@@ -68,13 +68,9 @@ public class UserServiceImpl implements IUserService {
sharerInfo.setUpdateTime(now);
sharerInfoMapper.insert(sharerInfo);
}
LoginUserInfo loginUserInfo = new LoginUserInfo();
loginUserInfo.setOpenId(sharerInfo.getOpenId());
loginUserInfo.setSharerAppId(null);
// 生成token
String token = LoginUserContextHolder.generateToken(bo.getCode(), loginUserInfo.getOpenId());
loginUserInfo.setAccessToken(token);
loginUserHelper.setLoginUserInfo(token, loginUserInfo);
String token = LoginUserContextHolder.generateToken(bo.getCode(), sharerInfo.getOpenId());
loginUserHelper.setLoginUserInfo(token, sharerInfo.getOpenId(), null);
return UserTokenVO.builder().token(token).build();
}
......@@ -95,12 +91,12 @@ public class UserServiceImpl implements IUserService {
WeChatSharerInfoVO sharerInfoVO;
Date now = new Date();
// 已绑定
if(SharerInfoVO.bindStatus.BIND.getCode().equals(result.getBindStatus())){
if (SharerInfoVO.bindStatus.BIND.getCode().equals(result.getBindStatus())) {
// 获取绑定信息
WeChatSharerListVO sharerListVO = weChatShopSharerListRequest.handle(loginUserInfo.getOpenId(), "", 1);
if (null != sharerListVO && !CollectionUtils.isEmpty(sharerListVO.getSharer_info_list())) {
sharerInfoVO = sharerListVO.getSharer_info_list().get(0);
if(null != sharerInfoVO){
if (null != sharerInfoVO) {
result.setSharerAppId(sharerInfoVO.getSharer_appid());
sharerInfo.setSharerAppid(sharerInfoVO.getSharer_appid());
Date bindTime = null != sharerInfoVO.getBind_time() ? new Date(sharerInfoVO.getBind_time()) : now;
......@@ -108,6 +104,9 @@ public class UserServiceImpl implements IUserService {
sharerInfo.setCommissionRatio(sharerInfoVO.getCommission_ratio());
String commissionType = null != sharerInfoVO.getCommission_type() ? sharerInfoVO.getCommission_type().toString() : CommissionTypeEnum.PLATFORM.getCode();
sharerInfo.setCommissionType(commissionType);
// 刷新缓存
loginUserInfo = loginUserHelper.setLoginUserInfo(loginUserInfo.getAccessToken(), sharerInfoVO.getSharer_appid());
LoginUserContextHolder.set(loginUserInfo);
}
}
}
......@@ -119,7 +118,7 @@ public class UserServiceImpl implements IUserService {
sharerInfo.setCreateTime(now);
sharerInfo.setUpdateTime(now);
sharerInfoMapper.insert(sharerInfo);
}else{
} else {
sharerInfo.setUpdateTime(now);
sharerInfoMapper.updateById(sharerInfo);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment