Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

liukangdong

2024-08-07 b0a4d23b83b9cdbdee15263acdd4e7353a8286a1

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

@@ -291,12 +291,8 @@
                member.setOpenid(openId);
                member.setType(Constants.ZERO);
                member.setAuthStatus(Constants.ZERO);
                member.setStatus(Constants.ZERO);
                //如果绑定了导购 则直接使用已绑定导购信息 跳过手机号绑定的状态
//                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());
@@ -305,12 +301,14 @@
                }
                memberMapper.insert(member);
            }else{
                ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
                if(!Objects.isNull(ztUserGetTokenResponse)){
                    member.setToken(ztUserGetTokenResponse.getToken());
                    member.setZtUserId(StringUtils.defaultString(ztUserGetTokenResponse.getZtUserId(),ztUserGetTokenResponse.getToken()));
                ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
                        member.getId(),ZTConstants.CUSTOMER);
                if(!Objects.isNull(ztBaseInfoResponse)){
                    member.setToken(ztBaseInfoResponse.getToken());
                    member.setZtUserId(StringUtils.defaultString(ztBaseInfoResponse.getZtUserId(),ztBaseInfoResponse.getToken()));
                    Member update = new Member();
                    update.setZtUserId(StringUtils.defaultString(ztUserGetTokenResponse.getZtUserId(),ztUserGetTokenResponse.getToken()));
                    update.setZtUserId(StringUtils.defaultString(ztBaseInfoResponse.getZtUserId(),ztBaseInfoResponse.getToken()));
                    update.setToken(member.getToken());
                    update.setToken(member.getToken());
                    update.setId(member.getId());
                    update.setAuthStatus(member.getAuthStatus());
@@ -336,7 +334,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));
@@ -455,7 +452,9 @@
            //未绑定过
            if (Objects.isNull(customerUser.getId())) {
                customerUserMapper.insert(customerUser);
                member.setAuthStatus(Constants.TWO);
            } else if(ztBaseResponse !=null) {
                member.setAuthStatus(Constants.TWO);
                customerUserMapper.updateById(customerUser);
            }
        }
@@ -543,7 +542,9 @@
            if(!Constants.equalsInteger(member.getPhone().length(),11)){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"手机号错误!");
            }
            if(Constants.equalsInteger(member.getAuthStatus(),Constants.ZERO)){
            member.setAuthStatus(Constants.ONE);
            }
        }
        memberMapper.updateById(member);
        return this.getMemberInfo(member.getId());
@@ -569,15 +570,17 @@
        ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(memberDto);
        if(!Objects.isNull(ztUserGetTokenResponse)){
            member.setToken(ztUserGetTokenResponse.getToken());
            member.setToken(StringUtils.defaultString(ztUserGetTokenResponse.getZtUserId(),ztUserGetTokenResponse.getToken()));
            member.setZtUserId(StringUtils.defaultString(ztUserGetTokenResponse.getZtUserId(),ztUserGetTokenResponse.getToken()));
        }
        if(Constants.equalsInteger(member.getAuthStatus(),Constants.ZERO)){
        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();
@@ -586,7 +589,14 @@
        ztUserInfoUpdateRequest.setPhone(member.getPhone());
        ztUserInfoUpdateRequest.setName(member.getName());
        ztUserInfoUpdateRequest.setNickName(member.getNickname());
//        ztUserInfoUpdateRequest.setAddress(member.getProvinceName()+member.getCityName()+member.getAreaName());
        if(StringUtils.isNotBlank(member.getProvinceName())
         && StringUtils.isNotBlank(member.getCityName())
         && StringUtils.isNotBlank(member.getAreaName())){
            ztUserInfoUpdateRequest.setAddress(member.getProvinceName()+member.getCityName()+member.getAreaName());
        }
        ztUserInfoUpdateRequest.setProvince(member.getProvinceCode());
        ztUserInfoUpdateRequest.setCity(member.getCityCode());
        ztUserInfoUpdateRequest.setCounty(member.getAreaCode());
        ztUserInfoUpdateRequest.setFullAddress(member.getAddress());
        String prefix = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
                systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode();
@@ -605,7 +615,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();
@@ -614,7 +624,16 @@
        ztUserInfoUpdateRequest.setPhone(member.getPhone());
        ztUserInfoUpdateRequest.setName(member.getName());
        ztUserInfoUpdateRequest.setNickName(member.getNickname());
//        ztUserInfoUpdateRequest.setAddress(member.getProvinceName()+member.getCityName()+member.getAreaName());

        if(StringUtils.isNotBlank(member.getProvinceName())
                && StringUtils.isNotBlank(member.getCityName())
                && StringUtils.isNotBlank(member.getAreaName())){
            ztUserInfoUpdateRequest.setAddress(member.getProvinceName()+member.getCityName()+member.getAreaName());
        }
        ztUserInfoUpdateRequest.setProvince(member.getProvinceCode());
        ztUserInfoUpdateRequest.setCity(member.getCityCode());
        ztUserInfoUpdateRequest.setCounty(member.getAreaCode());

        ztUserInfoUpdateRequest.setFullAddress(member.getAddress());
        String prefix = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
                systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode();