From 1941e9fc342b3a2cb6d32e9658ad46f29f50a5df Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 22 七月 2024 15:36:11 +0800
Subject: [PATCH] 代码提交

---
 server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |  122 ++++++++++++++++++++++++++--------------
 1 files changed, 78 insertions(+), 44 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 4d3cbf2..efb2eb7 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,13 +2,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,47 +21,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.*;
+import com.doumee.core.utils.CodeVerifyUtils;
+import com.doumee.core.utils.Constants;
+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 com.hikvision.artemis.sdk.util.HttpUtils;
 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.Date;
-import java.util.concurrent.TimeUnit;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * 鐢ㄦ埛淇℃伅琛⊿ervice瀹炵幇
@@ -276,7 +266,7 @@
 
 
     @Override
-    public AccountResponse wxLogin(String code){
+    public AccountResponse wxLogin(String code,String iamId){
         try {
 //            鑾峰彇寰俊鏁忔劅鏁版嵁
             WxMaJscode2SessionResult session = WxMiniConfig.wxCustomerService.getUserService().getSessionInfo(code);
@@ -285,7 +275,14 @@
                 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)){
+                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));
@@ -293,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(),"涓彴鏈嶅姟璋冭捣澶辫触!");
@@ -301,19 +303,20 @@
                     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)){
-                    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);
+            redisTemplate.opsForValue().set(ZTConstants.CUSTOMER+"_"+member.getId(),token);
             AccountResponse accountResponse = new AccountResponse();
             accountResponse.setToken(token);
             accountResponse.setSessionKey(session.getSessionKey());
@@ -324,6 +327,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){
@@ -412,13 +438,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){
@@ -429,6 +453,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;
     }
 
@@ -438,12 +471,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() ){
@@ -454,11 +487,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{
@@ -467,12 +500,12 @@
             }
             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();
@@ -480,7 +513,7 @@
                 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());
                     Date date =new Date(System.currentTimeMillis()+(Constants.formatLongNum(ztUserGetTokenResponse.getExpire())<=0?2*60*60*1000:ztUserGetTokenResponse.getExpire()*1000));
@@ -490,7 +523,7 @@
                     ztBaseInfoResponse.setToken(ztUserGetTokenResponse.getToken());
                     return ztBaseInfoResponse;
                 }else{
-//                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴TOKEN鑾峰彇澶辫触锛岃鑱旂郴绠$悊鍛�");
+//                   throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴TOKEN鑾峰彇澶辫触锛岃鑱旂郴绠$悊鍛�");
                 }
             }
             ztBaseInfoResponse.setToken(users.getToken());
@@ -502,8 +535,6 @@
     }
 
 
-
-
     @Override
     public ZTBaseRequst logOff(Long memberId){
         Member member = memberMapper.selectById(memberId);
@@ -511,20 +542,23 @@
             throw new BusinessException(ResponseStatus.DATA_EMPTY);
         }
         if(StringUtils.isBlank(member.getPhone())){
-            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸叉敞閿�");
+            redisTemplate.delete(ZTConstants.CUSTOMER+"_"+ member.getId());
+           return null;
         }
         //鏍¢獙鐢ㄦ埛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());
         memberMapper.update(new UpdateWrapper<Member>().lambda()
+                .set(Member::getOpenid,null)
                 .set(Member::getPhone,null)
                 .set(Member::getEditDate,new Date())
                 .eq(Member::getId,member.getId())
         );
+        redisTemplate.delete(ZTConstants.CUSTOMER+"_"+ member.getId());
         return ztBaseRequst;
     }
 

--
Gitblit v1.9.3