From 1b897c74e44d185669d87abd4c3a29c90d6fe225 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 19 七月 2024 20:10:27 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 7 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 98c5578..3c3b69d 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
@@ -28,6 +28,7 @@
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.Member;
import com.doumee.dao.business.model.Users;
import com.doumee.dao.web.reqeust.EditMemberRequest;
@@ -265,7 +266,7 @@
@Override
- public AccountResponse wxLogin(String code){
+ public AccountResponse wxLogin(String code,String iamId){
try {
// 鑾峰彇寰俊鏁忔劅鏁版嵁
WxMaJscode2SessionResult session = WxMiniConfig.wxCustomerService.getUserService().getSessionInfo(code);
@@ -275,6 +276,13 @@
}
// String openId = code;
Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId));
+ Users users = new Users();
+ if(StringUtils.isBlank(iamId)){
+ users = usersMapper.selectOne(new QueryWrapper<Users>().lambda()
+ .eq(Users::getIamId,iamId)
+ .last("limit 1")
+ );
+ }
if (member == null) {
member = new Member();
member.setNickname("寰俊鐢ㄦ埛"+ CodeVerifyUtils.createVerificationCode(4));
@@ -282,7 +290,12 @@
member.setIsdeleted(Constants.ZERO);
member.setOpenid(openId);
member.setType(Constants.ZERO);
- member.setAuthStatus(Constants.ZERO);
+ //濡傛灉缁戝畾浜嗗璐� 鍒欑洿鎺ヤ娇鐢ㄥ凡缁戝畾瀵艰喘淇℃伅 璺宠繃鎵嬫満鍙风粦瀹氱殑鐘舵��
+ if(Objects.nonNull(users)){
+ member.setAuthStatus(Constants.TWO);
+ }else{
+ member.setAuthStatus(Constants.ZERO);
+ }
ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
if(Objects.isNull(ztUserGetTokenResponse)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴鏈嶅姟璋冭捣澶辫触!");
@@ -290,7 +303,7 @@
member.setToken(ztUserGetTokenResponse.getToken());
}
memberMapper.insert(member);
- member = this.getMemberInfo(member.getId());
+ this.saveCustomerUser(users,member.getId());
}else{
ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
if(Objects.isNull(ztUserGetTokenResponse)){
@@ -298,7 +311,9 @@
}else{
member.setToken(ztUserGetTokenResponse.getToken());
}
+ this.saveCustomerUser(users,member.getId());
member = this.getMemberInfo(member.getId());
+
}
//鍒涘缓token
JwtPayLoad payLoad = new JwtPayLoad(member.getId(),Constants.ZERO);
@@ -313,6 +328,29 @@
}
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"寰俊鐧诲綍寮傚父锛佽鑱旂郴绠＄悊鍛�");
}
+
+ 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 绛夊緟璋冭捣涓彴鎺ュ彛
+ }
+ }
+
@Override
public String getWxMiniPhone(WxPhoneRequest wxPhoneRequest){
@@ -407,8 +445,6 @@
return ztUserGetTokenResponse;
}
-
-
@Override
public Member getMemberInfo(Long memberId){
Member member = memberMapper.selectById(memberId);
@@ -418,6 +454,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;
}
@@ -443,11 +488,11 @@
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));
+// Date date =new Date(System.currentTimeMillis()+(Constants.formatLongNum(ztUserGetTokenResponse.getExpire())<=0?2*60*60*1000:ztUserGetTokenResponse.getExpire()*1000));
member.setToken(ztUserGetTokenResponse.getToken());
memberMapper.update(new UpdateWrapper<Member>().lambda()
.set(Member::getToken,ztUserGetTokenResponse.getToken())
- .set(Member::getTokenDate,date)//榛樿鏈夋晥鏈熶负涓ゅ皬鏃�
+// .set(Member::getTokenDate,date)//榛樿鏈夋晥鏈熶负涓ゅ皬鏃�
.eq(Member::getId,member.getId()));
ztBaseInfoResponse.setToken(ztUserGetTokenResponse.getToken());
}else{
--
Gitblit v1.9.3