Merge remote-tracking branch 'origin/master'

jiangping

2024-07-17 3a355771834c39d38a628132031ce1c52bc64478

 server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -454,14 +454,15 @@
                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获取失败，请联系管理员");
//                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"中台TOKEN获取失败，请联系管理员");
                }
            }
            ztBaseInfoResponse.setToken(member.getToken());
@@ -482,27 +483,29 @@
                ZTUserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getUserToken(param);
                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获取失败，请联系管理员");
//                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"中台TOKEN获取失败，请联系管理员");
                }
            }
            ztBaseInfoResponse.setToken(users.getToken());
            return ztBaseInfoResponse;
//            return ztBaseInfoResponse;
        }else{
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"参数错误");
//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"参数错误");
        }
        return  ztBaseInfoResponse;
    }




    @Override
    public void logOff(Long memberId){
    public ZTBaseRequst logOff(Long memberId){
        Member member = memberMapper.selectById(memberId);
        if(Objects.isNull(member)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
@@ -517,16 +520,12 @@
        ztBaseRequst.setUserType(Constants.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::getPhone,null)
                .set(Member::getEditDate,new Date())
                .eq(Member::getId,member.getId())
        );
        return ztBaseRequst;
    }