From c0cb31a27522f2b480d7f98784eef37c2fb75f2d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 30 七月 2024 09:10:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |  148 +++++++++++++++++++++++++++----------------------
 1 files changed, 82 insertions(+), 66 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 3c3b69d..494e1bf 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;
@@ -13,6 +14,7 @@
 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.ZTCustomerBindingUsersRequest;
 import com.doumee.biz.zbom.model.zhongtai.response.ZTSysuserGetTokenResponse;
 import com.doumee.biz.zbom.model.zhongtai.response.ZTUserGetTokenResponse;
 import com.doumee.config.Jwt.JwtPayLoad;
@@ -266,7 +268,7 @@
 
 
     @Override
-    public AccountResponse wxLogin(String code,String iamId){
+    public AccountResponse wxLogin(String code,String userId){
         try {
 //            鑾峰彇寰俊鏁忔劅鏁版嵁
             WxMaJscode2SessionResult session = WxMiniConfig.wxCustomerService.getUserService().getSessionInfo(code);
@@ -275,13 +277,10 @@
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇openid澶辫触锛佽鑱旂郴绠$悊鍛�");
             }
 //            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")
-                );
+            Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId).last(" limit 1  "));
+            Users users =  null;
+            if(StringUtils.isNotBlank(userId)){
+                users = usersMapper.selectById(userId);
             }
             if (member == null) {
                 member = new Member();
@@ -297,27 +296,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());
+                MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,users,member.getId(),member.getOpenid());
             }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());
+                MemberServiceImpl.saveCustomerUser(zbomZhongTaiService,customerUserMapper,users,member.getId(),member.getOpenid());
                 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());
@@ -329,25 +322,68 @@
         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 AccountResponse testLogin(String openid){
+            String openId = openid;
+            Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId).isNotNull("phone"));
+
+            if (member == null) {
+                member = new Member();
+                member.setNickname("寰俊鐢ㄦ埛"+ CodeVerifyUtils.createVerificationCode(4));
+                member.setCreateDate(new Date());
+                member.setIsdeleted(Constants.ZERO);
+                member.setOpenid(openId);
+                member.setType(Constants.ZERO);
+                //濡傛灉缁戝畾浜嗗璐� 鍒欑洿鎺ヤ娇鐢ㄥ凡缁戝畾瀵艰喘淇℃伅 璺宠繃鎵嬫満鍙风粦瀹氱殑鐘舵��
+                    member.setAuthStatus(Constants.ZERO);
+                ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
+                if(!Objects.isNull(ztUserGetTokenResponse)){
+                    member.setToken(ztUserGetTokenResponse.getToken());
+                }
+                memberMapper.insert(member);
+            }else{
+                ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
+                if(!Objects.isNull(ztUserGetTokenResponse)){
+                    member.setToken(ztUserGetTokenResponse.getToken());
+                    memberMapper.updateById(member);
+                }
+                member = this.getMemberInfo(member.getId());
+            }
+            String token = JwtTokenUtil.generateTokenForZb(member.getId(),ZTConstants.CUSTOMER, JSONObject.toJSON(member).toString(),redisTemplate);
+            AccountResponse accountResponse = new AccountResponse();
+            accountResponse.setToken(token);
+            accountResponse.setMember(member);
+            return accountResponse;
+    }
+
+    public static void saveCustomerUser(ZbomZhongTaiService zbomZhongTaiService,CustomerUserMapper customerUserMapper,Users users,Long memberId,String openId){
+        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);
+                //绛夊緟璋冭捣涓彴鎺ュ彛
+                ZTCustomerBindingUsersRequest ztCustomerBindingUsersRequest = new ZTCustomerBindingUsersRequest();
+                ztCustomerBindingUsersRequest.setOpenId(openId);
+                ztCustomerBindingUsersRequest.setSourceCustomerId(memberId.toString());
+                ztCustomerBindingUsersRequest.setDaoGouUserId(users.getId().toString());
+                ztCustomerBindingUsersRequest.setDaoGouAccount(users.getIamUsername());
+                ztCustomerBindingUsersRequest.setDaoGouType(users.getUserTypes());
+                ztCustomerBindingUsersRequest.setUserName(users.getIamId());
+                ztCustomerBindingUsersRequest.setPlatSource(ZTConstants.PLATFORM_MP_WX);
+                zbomZhongTaiService.customerBinDingUsers(ztCustomerBindingUsersRequest);
+            }
         }
     }
 
@@ -382,12 +418,6 @@
         Member memberDto = new Member();
         BeanUtils.copyProperties(editMemberRequest,memberDto);
         memberDto.setOpenid(member.getOpenid());
-//        ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(memberDto);
-//        if(Objects.isNull(ztUserGetTokenResponse)){
-//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴鏈嶅姟璋冭捣澶辫触!");
-//        }else{
-//            member.setToken(ztUserGetTokenResponse.getToken());
-//        }
         memberMapper.updateById(memberDto);
         return this.getMemberInfo(member.getId());
     }
@@ -439,7 +469,7 @@
         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;
@@ -454,7 +484,8 @@
         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){
+        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())){
@@ -495,8 +526,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());
@@ -509,11 +538,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());
@@ -523,29 +547,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);
@@ -555,10 +569,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