From a75b18a4157ab486e0b51c438ac165ab3a08e3e0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 25 七月 2024 18:10:00 +0800
Subject: [PATCH] 代码提交
---
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 189 ++++++++++++++++++++++------------------------
1 files changed, 91 insertions(+), 98 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 70150df..c6c0fa3 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
@@ -3,12 +3,18 @@
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;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.biz.zbom.ZbomZhongTaiService;
import com.doumee.biz.zbom.model.zhongtai.ZTBaseRequst;
+import com.doumee.biz.zbom.model.zhongtai.ZTConstants;
import com.doumee.biz.zbom.model.zhongtai.ZTUserGetTokenRequest;
import com.doumee.biz.zbom.model.zhongtai.ZTUserInfoUpdateRequest;
import com.doumee.biz.zbom.model.zhongtai.response.ZTBaseResponse;
+import com.doumee.biz.zbom.model.zhongtai.response.ZTSysuserGetTokenResponse;
import com.doumee.biz.zbom.model.zhongtai.response.ZTUserGetTokenResponse;
import com.doumee.config.Jwt.JwtPayLoad;
import com.doumee.config.Jwt.JwtTokenUtil;
@@ -16,48 +22,32 @@
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.core.oss.FileModel;
import com.doumee.core.utils.CodeVerifyUtils;
import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.core.wx.WxMiniConfig;
import com.doumee.dao.business.CustomerUserMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.UsersMapper;
import com.doumee.dao.business.model.CustomerUser;
-import com.doumee.dao.business.model.InterfaceLog;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Users;
-import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.web.reqeust.EditMemberRequest;
import com.doumee.dao.web.reqeust.WxPhoneRequest;
import com.doumee.dao.web.response.AccountResponse;
import com.doumee.dao.web.response.ZTBaseInfoResponse;
-import com.doumee.service.business.CustomerService;
import com.doumee.service.business.MemberService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import me.chanjar.weixin.common.error.WxErrorException;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.apache.catalina.User;
import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.util.ThreadContext;
-import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
/**
* 鐢ㄦ埛淇℃伅琛⊿ervice瀹炵幇
@@ -277,16 +267,20 @@
@Override
- public AccountResponse wxLogin(String code){
+ public AccountResponse wxLogin(String code,String userId){
try {
- //鑾峰彇寰俊鏁忔劅鏁版嵁
+// 鑾峰彇寰俊鏁忔劅鏁版嵁
WxMaJscode2SessionResult session = WxMiniConfig.wxCustomerService.getUserService().getSessionInfo(code);
String openId = session.getOpenid();
if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(openId)) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇openid澶辫触锛佽鑱旂郴绠＄悊鍛�");
}
- Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId));
- String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
+// String openId = code;
+ Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId).isNotNull("phone"));
+ Users users = new Users();
+ if(StringUtils.isNotBlank(userId)){
+ users = usersMapper.selectById(userId);
+ }
if (member == null) {
member = new Member();
member.setNickname("寰俊鐢ㄦ埛"+ CodeVerifyUtils.createVerificationCode(4));
@@ -294,27 +288,28 @@
member.setIsdeleted(Constants.ZERO);
member.setOpenid(openId);
member.setType(Constants.ZERO);
- member.setAuthStatus(Constants.ZERO);
- // ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(memberDto);
- // if(Objects.isNull(ztUserGetTokenResponse)){
- // throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴鏈嶅姟璋冭捣澶辫触!");
- // }else{
- // member.setToken(ztUserGetTokenResponse.getToken());
- // }
+ //濡傛灉缁戝畾浜嗗璐� 鍒欑洿鎺ヤ娇鐢ㄥ凡缁戝畾瀵艰喘淇℃伅 璺宠繃鎵嬫満鍙风粦瀹氱殑鐘舵��
+ if(Objects.nonNull(users)){
+ member.setAuthStatus(Constants.TWO);
+ }else{
+ member.setAuthStatus(Constants.ZERO);
+ }
+ ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
+ if(!Objects.isNull(ztUserGetTokenResponse)){
+ member.setToken(ztUserGetTokenResponse.getToken());
+ }
memberMapper.insert(member);
- member = this.getMemberInfo(member.getId());
+ MemberServiceImpl.saveCustomerUser(customerUserMapper,users,member.getId());
}else{
- // ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(memberDto);
- // if(Objects.isNull(ztUserGetTokenResponse)){
- // throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴鏈嶅姟璋冭捣澶辫触!");
- // }else{
- // member.setToken(ztUserGetTokenResponse.getToken());
- // }
+ ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
+ if(!Objects.isNull(ztUserGetTokenResponse)){
+ member.setToken(ztUserGetTokenResponse.getToken());
+ memberMapper.updateById(member);
+ }
+ MemberServiceImpl.saveCustomerUser(customerUserMapper,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());
@@ -325,6 +320,28 @@
}
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"寰俊鐧诲綍寮傚父锛佽鑱旂郴绠＄悊鍛�");
}
+
+ public static void saveCustomerUser(CustomerUserMapper customerUserMapper,Users users,Long memberId){
+ 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 绛夊緟璋冭捣涓彴鎺ュ彛
+ }
+ }
+ }
+
@Override
public String getWxMiniPhone(WxPhoneRequest wxPhoneRequest){
@@ -399,7 +416,7 @@
ztUserInfoUpdateRequest.setPlatform(Constants.PLATFORM);
ztUserInfoUpdateRequest.setPhone(member.getPhone());
ztUserInfoUpdateRequest.setName(member.getNickname());
- ztUserInfoUpdateRequest.setAddress(member.getProvinceName()+member.getCityName()+member.getAreaName());
+// ztUserInfoUpdateRequest.setAddress(member.getProvinceName()+member.getCityName()+member.getAreaName());
ztUserInfoUpdateRequest.setFullAddress(member.getAddress());
String prefix = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode();
@@ -413,13 +430,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){
@@ -430,6 +445,15 @@
String prefix = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode();
member.setPrefix(prefix);
+ if( customerUserMapper.selectCount(new QueryWrapper<CustomerUser>().lambda().eq(CustomerUser::getIsdeleted,Constants.ZERO).eq(CustomerUser::getMemberId,member.getId()))>0){
+ member.setAuthStatus(Constants.TWO);
+ }else{
+ if(StringUtils.isBlank(member.getPhone())){
+ member.setAuthStatus(Constants.ZERO);
+ }else{
+ member.setAuthStatus(Constants.ONE);
+ }
+ }
return member;
}
@@ -439,12 +463,12 @@
public static ZTBaseInfoResponse getZTToken(ZbomZhongTaiService zbomZhongTaiService,
MemberMapper memberMapper, UsersMapper usersMapper, SystemDictDataBiz systemDictDataBiz, Long id, String userType){
ZTBaseInfoResponse ztBaseInfoResponse = new ZTBaseInfoResponse();
- if(userType.equals(Constants.CUSTOMER)){
+ if(userType.equals(ZTConstants.CUSTOMER)){
Member member = memberMapper.selectById(id);
if(Objects.isNull(member)){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- ztBaseInfoResponse.setUserType(Constants.CUSTOMER);
+ ztBaseInfoResponse.setUserType(ZTConstants.CUSTOMER);
ztBaseInfoResponse.setOpenId(member.getOpenid());
//濡傛灉鏃犳湁鏁堟湡/宸茶繃鏈� 閲嶆柊鑾峰彇
if(Objects.isNull(member.getTokenDate()) || member.getTokenDate().getTime()<=System.currentTimeMillis() ){
@@ -455,97 +479,66 @@
param.setOpenId(member.getOpenid());
ZTUserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getUserToken(param);
if(Objects.nonNull(ztUserGetTokenResponse)){
+// Date date =new Date(System.currentTimeMillis()+(Constants.formatLongNum(ztUserGetTokenResponse.getExpire())<=0?2*60*60*1000:ztUserGetTokenResponse.getExpire()*1000));
member.setToken(ztUserGetTokenResponse.getToken());
- //TODO 鏆傛棤杩囨湡鏃ユ湡
- memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getToken,ztUserGetTokenResponse.getToken())
+ memberMapper.update(new UpdateWrapper<Member>().lambda()
+ .set(Member::getToken,ztUserGetTokenResponse.getToken())
+// .set(Member::getTokenDate,date)//榛樿鏈夋晥鏈熶负涓ゅ皬鏃�
.eq(Member::getId,member.getId()));
ztBaseInfoResponse.setToken(ztUserGetTokenResponse.getToken());
- return ztBaseInfoResponse;
- }else{
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴TOKEN鑾峰彇澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
ztBaseInfoResponse.setToken(member.getToken());
return ztBaseInfoResponse;
- }else if(userType.equals(Constants.BUSINESS)){
+ }else if(userType.equals(ZTConstants.BUSINESS)){
Users users = usersMapper.selectById(id);
if(Objects.isNull(users)){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- ztBaseInfoResponse.setUserType(Constants.BUSINESS);
+ 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());
- ZTUserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getUserToken(param);
+ ZTSysuserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getSysuserToken(users.getPhone());
if(Objects.nonNull(ztUserGetTokenResponse)){
users.setToken(ztUserGetTokenResponse.getToken());
- //TODO 鏆傛棤杩囨湡鏃ユ湡
+ Date date =new Date(System.currentTimeMillis()+(Constants.formatLongNum(ztUserGetTokenResponse.getExpire())<=0?2*60*60*1000:ztUserGetTokenResponse.getExpire()*1000));
usersMapper.update(new UpdateWrapper<Users>().lambda().set(Users::getToken,ztUserGetTokenResponse.getToken())
+ .set(Users::getTokenDate,date)//榛樿鏈夋晥鏈熶负涓ゅ皬鏃�
.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 void 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(),Constants.CUSTOMER);
+ MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,member.getId(),ZTConstants.CUSTOMER);
//璋冭捣涓彴娉ㄩ攢鎺ュ彛
ZTBaseRequst ztBaseRequst = new ZTBaseRequst();
- ztBaseRequst.setUserType(Constants.CUSTOMER);
+ ztBaseRequst.setUserType(ZTConstants.CUSTOMER);
ztBaseRequst.setOpenId(member.getOpenid());
ztBaseRequst.setToken(member.getToken());
- Boolean logoutFlag = zbomZhongTaiService.userLogout(ztBaseRequst);
- if(logoutFlag){
- memberMapper.update(new UpdateWrapper<Member>().lambda()
- .set(Member::getPhone,null)
- .set(Member::getEditDate,new Date())
- .eq(Member::getId,member.getId())
- );
- return;
- }
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴娉ㄩ攢澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ memberMapper.update(new UpdateWrapper<Member>().lambda()
+ .set(Member::getOpenid,null)
+ .set(Member::getPhone,null)
+ .set(Member::getEditDate,new Date())
+ .eq(Member::getOpenid,member.getOpenid())
+ );
+ redisTemplate.delete(token);
+ return ztBaseRequst;
}
- @Override
- public void updWxMiniToken(){
- DefaultWebSecurityManager manager = new DefaultWebSecurityManager();
- ThreadContext.bind(manager);
- String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
- String appSecret = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_SECRET_CUSTOMER).getCode();
- //鐢熸垚寰俊token
- String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="+appId+"&secret="+appSecret;
- String response = Constants.doGet(url,null);
- JSONObject json = JSONObject.parseObject(response);
- SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_TOKEN_CUSTOMER);
- systemDictData.setCode(json.getString("access_token"));
- systemDictData.setUpdateTime(new Date());
- systemDictDataBiz.updateByIdNew(systemDictData);
- }
}
--
Gitblit v1.9.3