From af9f7ad7d711f0562e4394449a117da20f808fc2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 24 七月 2024 16:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 51 ++++++++++++++++++++++-----------------------------
1 files changed, 22 insertions(+), 29 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index b4d1738..ea5a395 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -278,7 +278,7 @@
// String openId = code;
Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId).isNotNull("phone"));
Users users = new Users();
- if(StringUtils.isBlank(iamId)){
+ if(StringUtils.isNotBlank(iamId)){
users = usersMapper.selectOne(new QueryWrapper<Users>().lambda()
.eq(Users::getIamId,iamId)
.last("limit 1")
@@ -298,9 +298,7 @@
member.setAuthStatus(Constants.ZERO);
}
ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
- if(Objects.isNull(ztUserGetTokenResponse)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴鏈嶅姟璋冭捣澶辫触!");
- }else{
+ if(!Objects.isNull(ztUserGetTokenResponse)){
member.setToken(ztUserGetTokenResponse.getToken());
}
memberMapper.insert(member);
@@ -314,7 +312,7 @@
this.saveCustomerUser(users,member.getId());
member = this.getMemberInfo(member.getId());
}
- String token = JwtTokenUtil.generateTokenForZb(users.getId(),ZTConstants.CUSTOMER, JSONObject.toJSON(member).toString(),redisTemplate);
+ String token = JwtTokenUtil.generateTokenForZb(member.getId(),ZTConstants.CUSTOMER, JSONObject.toJSON(member).toString(),redisTemplate);
AccountResponse accountResponse = new AccountResponse();
accountResponse.setToken(token);
accountResponse.setSessionKey(session.getSessionKey());
@@ -327,24 +325,23 @@
}
public void saveCustomerUser(Users users,Long memberId){
- if(!(Objects.nonNull(users)&&Objects.nonNull(memberId))){
- return;
- }
- if( customerUserMapper.selectCount(new QueryWrapper<CustomerUser>().lambda()
- .eq(CustomerUser::getIsdeleted,Constants.ZERO)
- .eq(CustomerUser::getUserId,users.getId())
- .eq(CustomerUser::getMemberId,memberId)) <= Constants.ZERO ){
- CustomerUser customerUser = new CustomerUser();
- customerUser.setUserId(users.getId());
- customerUser.setCreateDate(new Date());
- customerUser.setMemberId(memberId);
- customerUser.setPhone(users.getPhone());
- customerUser.setIamUserId(users.getIamId());
- customerUser.setName(users.getName());
- customerUser.setUsername(users.getIamUsername());
- customerUser.setAddr(users.getShopAddress());
- customerUserMapper.insert(customerUser);
- //TODO 绛夊緟璋冭捣涓彴鎺ュ彛
+ if(Objects.nonNull(users)&&Objects.nonNull(memberId)) {
+ if (customerUserMapper.selectCount(new QueryWrapper<CustomerUser>().lambda()
+ .eq(CustomerUser::getIsdeleted, Constants.ZERO)
+ .eq(CustomerUser::getUserId, users.getId())
+ .eq(CustomerUser::getMemberId, memberId)) <= Constants.ZERO) {
+ CustomerUser customerUser = new CustomerUser();
+ customerUser.setUserId(users.getId());
+ customerUser.setCreateDate(new Date());
+ customerUser.setMemberId(memberId);
+ customerUser.setPhone(users.getPhone());
+ customerUser.setIamUserId(users.getIamId());
+ customerUser.setName(users.getName());
+ customerUser.setUsername(users.getIamUsername());
+ customerUser.setAddr(users.getShopAddress());
+ customerUserMapper.insert(customerUser);
+ //TODO 绛夊緟璋冭捣涓彴鎺ュ彛
+ }
}
}
@@ -527,10 +524,6 @@
if(Objects.isNull(member)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(StringUtils.isBlank(member.getPhone())){
- redisTemplate.delete(token);
- return null;
- }
//鏍￠獙鐢ㄦ埛token淇℃伅
MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,member.getId(),ZTConstants.CUSTOMER);
//璋冭捣涓彴娉ㄩ攢鎺ュ彛
@@ -542,9 +535,9 @@
.set(Member::getOpenid,null)
.set(Member::getPhone,null)
.set(Member::getEditDate,new Date())
- .eq(Member::getId,member.getId())
+ .eq(Member::getOpenid,member.getOpenid())
);
- redisTemplate.delete(ZTConstants.CUSTOMER+"_"+ member.getId());
+ redisTemplate.delete(token);
return ztBaseRequst;
}
--
Gitblit v1.9.3