From b26da15df0f71a11e7d04abd0aa2284d8b8cdef0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 24 七月 2024 17:22:21 +0800
Subject: [PATCH] 提交
---
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 81 ++++++++++++++--------------------------
1 files changed, 29 insertions(+), 52 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 37739e1..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
@@ -2,6 +2,7 @@
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -275,9 +276,9 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇openid澶辫触锛佽鑱旂郴绠＄悊鍛�");
}
// String openId = code;
- Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId));
+ 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")
@@ -297,27 +298,21 @@
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);
this.saveCustomerUser(users,member.getId());
}else{
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.updateById(member);
}
this.saveCustomerUser(users,member.getId());
member = this.getMemberInfo(member.getId());
-
}
- //鍒涘缓token
- JwtPayLoad payLoad = new JwtPayLoad(member.getId(),Constants.ZERO);
- String token = JwtTokenUtil.generateToken(payLoad);
+ String token = JwtTokenUtil.generateTokenForZb(member.getId(),ZTConstants.CUSTOMER, JSONObject.toJSON(member).toString(),redisTemplate);
AccountResponse accountResponse = new AccountResponse();
accountResponse.setToken(token);
accountResponse.setSessionKey(session.getSessionKey());
@@ -330,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 绛夊緟璋冭捣涓彴鎺ュ彛
+ }
}
}
@@ -439,13 +433,11 @@
ztUserInfoUpdateRequest.setHouseLayout(Constants.getHouseLayout(member.getHousetype()));
ZTBaseResponse userUpdateInfo = zbomZhongTaiService.userUpdateInfo(ztUserInfoUpdateRequest);
if(Objects.isNull(userUpdateInfo)||userUpdateInfo.getCode()!=200){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴淇℃伅鏇存柊澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ return null;
}
ZTUserGetTokenResponse ztUserGetTokenResponse = (ZTUserGetTokenResponse) userUpdateInfo.getData();
return ztUserGetTokenResponse;
}
-
-
@Override
public Member getMemberInfo(Long memberId){
@@ -497,8 +489,6 @@
// .set(Member::getTokenDate,date)//榛樿鏈夋晥鏈熶负涓ゅ皬鏃�
.eq(Member::getId,member.getId()));
ztBaseInfoResponse.setToken(ztUserGetTokenResponse.getToken());
- }else{
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴TOKEN鑾峰彇澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
ztBaseInfoResponse.setToken(member.getToken());
@@ -511,11 +501,6 @@
ztBaseInfoResponse.setUserType(ZTConstants.BUSINESS);
ztBaseInfoResponse.setOpenId(users.getOpenid());
if(Objects.isNull(users.getTokenDate()) || users.getTokenDate().getTime()<=System.currentTimeMillis() ){
- ZTUserGetTokenRequest param = new ZTUserGetTokenRequest();
- //鏌ヨAPPID
- String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
- param.setAppId(appId);
- param.setOpenId(users.getOpenid());
ZTSysuserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getSysuserToken(users.getPhone());
if(Objects.nonNull(ztUserGetTokenResponse)){
users.setToken(ztUserGetTokenResponse.getToken());
@@ -525,29 +510,19 @@
.eq(Users::getId,users.getId()));
ztBaseInfoResponse.setToken(ztUserGetTokenResponse.getToken());
return ztBaseInfoResponse;
- }else{
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴TOKEN鑾峰彇澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
ztBaseInfoResponse.setToken(users.getToken());
-// return ztBaseInfoResponse;
- }else{
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍙傛暟閿欒");
}
return ztBaseInfoResponse;
}
-
-
@Override
- public ZTBaseRequst logOff(Long memberId){
+ public ZTBaseRequst logOff(Long memberId,String token){
Member member = memberMapper.selectById(memberId);
if(Objects.isNull(member)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
- }
- if(StringUtils.isBlank(member.getPhone())){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸叉敞閿�");
}
//鏍￠獙鐢ㄦ埛token淇℃伅
MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,member.getId(),ZTConstants.CUSTOMER);
@@ -557,10 +532,12 @@
ztBaseRequst.setOpenId(member.getOpenid());
ztBaseRequst.setToken(member.getToken());
memberMapper.update(new UpdateWrapper<Member>().lambda()
+ .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(token);
return ztBaseRequst;
}
--
Gitblit v1.9.3