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 | 95 +++++++++++++++++++++++++++++------------------ 1 files changed, 58 insertions(+), 37 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..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 @@ -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; @@ -28,6 +29,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 +267,7 @@ @Override - public AccountResponse wxLogin(String code){ + public AccountResponse wxLogin(String code,String userId){ try { // 鑾峰彇寰俊鏁忔劅鏁版嵁 WxMaJscode2SessionResult session = WxMiniConfig.wxCustomerService.getUserService().getSessionInfo(code); @@ -274,7 +276,11 @@ 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.isNotBlank(userId)){ + users = usersMapper.selectById(userId); + } if (member == null) { member = new Member(); member.setNickname("寰俊鐢ㄦ埛"+ CodeVerifyUtils.createVerificationCode(4)); @@ -282,27 +288,28 @@ member.setIsdeleted(Constants.ZERO); member.setOpenid(openId); member.setType(Constants.ZERO); - member.setAuthStatus(Constants.ZERO); - ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member); - if(Objects.isNull(ztUserGetTokenResponse)){ - throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴鏈嶅姟璋冭捣澶辫触!"); + //濡傛灉缁戝畾浜嗗璐� 鍒欑洿鎺ヤ娇鐢ㄥ凡缁戝畾瀵艰喘淇℃伅 璺宠繃鎵嬫満鍙风粦瀹氱殑鐘舵�� + 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(member); - if(Objects.isNull(ztUserGetTokenResponse)){ - throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴鏈嶅姟璋冭捣澶辫触!"); - }else{ + 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()); @@ -313,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){ @@ -401,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){ @@ -418,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; } @@ -443,15 +479,13 @@ 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{ -// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴TOKEN鑾峰彇澶辫触锛岃鑱旂郴绠$悊鍛�"); } } ztBaseInfoResponse.setToken(member.getToken()); @@ -464,11 +498,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()); @@ -478,29 +507,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); @@ -510,10 +529,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