aa

jiangping

2024-08-07 a9eccf12bba4075ecb6ffe9650826ce6127bbe82

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

@@ -290,6 +290,7 @@
                member.setIsdeleted(Constants.ZERO);
                member.setOpenid(openId);
                member.setType(Constants.ZERO);
                member.setAuthStatus(Constants.ZERO);
                //如果绑定了导购 则直接使用已绑定导购信息 跳过手机号绑定的状态
//                if(Objects.nonNull(users)){
//                    member.setAuthStatus(Constants.TWO);
@@ -335,7 +336,6 @@
    public AccountResponse testLogin(String openid){
            String openId = openid;
            Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId));

            if (member == null) {
                member = new Member();
                member.setNickname("微信用户"+ CodeVerifyUtils.createVerificationCode(4));
@@ -518,7 +518,7 @@
        } catch (Exception e) {
            e.printStackTrace();
        }
        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"更新手机号失败");
        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"获取手机号失败");
    }


@@ -537,6 +537,12 @@
        if(!Objects.isNull(ztUserGetTokenResponse)){
            member.setToken(ztUserGetTokenResponse.getToken());
            member.setZtUserId(StringUtils.defaultString(ztUserGetTokenResponse.getZtUserId(),ztUserGetTokenResponse.getToken()));
        }
        if(StringUtils.isNotBlank(member.getPhone())){
            if(!Constants.equalsInteger(member.getPhone().length(),11)){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"手机号错误!");
            }
            member.setAuthStatus(Constants.ONE);
        }
        memberMapper.updateById(member);
        return this.getMemberInfo(member.getId());
@@ -560,18 +566,17 @@
        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{
        if(!Objects.isNull(ztUserGetTokenResponse)){
            member.setToken(ztUserGetTokenResponse.getToken());
            member.setToken(StringUtils.defaultString(ztUserGetTokenResponse.getZtUserId(),ztUserGetTokenResponse.getToken()));
        }
        memberDto.setAuthStatus(Constants.ONE);
        memberMapper.updateById(memberDto);
        return this.getMemberInfo(member.getId());
    }


    public ZTUserGetTokenResponse syncZhongTaiUser(Member member){
    public static ZTUserGetTokenResponse syncZhongTaiUserNew(Member member,SystemDictDataBiz systemDictDataBiz,ZbomZhongTaiService zbomZhongTaiService){
        ZTUserInfoUpdateRequest ztUserInfoUpdateRequest = new  ZTUserInfoUpdateRequest();
        ztUserInfoUpdateRequest.setOpenId(member.getOpenid());
        String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
@@ -579,7 +584,7 @@
        ztUserInfoUpdateRequest.setPlatform(Constants.PLATFORM);
        ztUserInfoUpdateRequest.setPhone(member.getPhone());
        ztUserInfoUpdateRequest.setName(member.getName());
        ztUserInfoUpdateRequest.setNickname(member.getNickname());
        ztUserInfoUpdateRequest.setNickName(member.getNickname());
//        ztUserInfoUpdateRequest.setAddress(member.getProvinceName()+member.getCityName()+member.getAreaName());
        ztUserInfoUpdateRequest.setFullAddress(member.getAddress());
        String prefix = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
@@ -599,7 +604,7 @@
        ZTUserGetTokenResponse ztUserGetTokenResponse = (ZTUserGetTokenResponse) userUpdateInfo.getData();
        return ztUserGetTokenResponse;
    }
    public static ZTUserGetTokenResponse syncZhongTaiUserNew(Member member,SystemDictDataBiz systemDictDataBiz,ZbomZhongTaiService zbomZhongTaiService){
    public ZTUserGetTokenResponse syncZhongTaiUser(Member member){
        ZTUserInfoUpdateRequest ztUserInfoUpdateRequest = new  ZTUserInfoUpdateRequest();
        ztUserInfoUpdateRequest.setOpenId(member.getOpenid());
        String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
@@ -607,7 +612,7 @@
        ztUserInfoUpdateRequest.setPlatform(Constants.PLATFORM);
        ztUserInfoUpdateRequest.setPhone(member.getPhone());
        ztUserInfoUpdateRequest.setName(member.getName());
        ztUserInfoUpdateRequest.setNickname(member.getNickname());
        ztUserInfoUpdateRequest.setNickName(member.getNickname());
//        ztUserInfoUpdateRequest.setAddress(member.getProvinceName()+member.getCityName()+member.getAreaName());
        ztUserInfoUpdateRequest.setFullAddress(member.getAddress());
        String prefix = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +