代码提交

k94314517

2024-08-05 c6b21925af97c059c128763b52750444df9fdaa9

代码提交

 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);
@@ -518,7 +519,7 @@
        } catch (Exception e) {
            e.printStackTrace();
        }
        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"更新手机号失败");
        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"获取手机号失败");
    }


@@ -537,6 +538,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,12 +567,11 @@
        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());
    }

 server/service/src/main/resources/application-pro.yml

@@ -7,10 +7,10 @@
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
  redis:
    #    database: 0
    host: 127.0.0.1
    port: 6379
    password:
    #    志邦家选可以用的redis，这个redisU客也在用
    host: 10.200.100.39
    port: 20032
    password: Zbom_2020@123
    timeout: 5000      # 连接池中的最小空闲连接
  jackson:
    time-zone: GMT+8

 server/web/src/main/java/com/doumee/api/web/CustomerApi.java

@@ -123,13 +123,11 @@
    public ApiResponse<Member> editMember(@RequestBody EditMemberRequest editMemberRequest) {
        editMemberRequest.setId(getMemberId());
        String  phone = editMemberRequest.getPhone();
//        if(StringUtils.isNotBlank(editMemberRequest.getPhone())){
//            customerUserService.syncByPhone(editMemberRequest.getPhone());
//        }
        //同步导购绑定信息
        Member member =memberService.updMemberDetail(editMemberRequest);
        if(StringUtils.isNotBlank(phone)){
            customerUserService.syncByPhone(member);
          member = memberService.getMemberInfo(member.getId());
        }
        return  ApiResponse.success("更新成功",member);
    }
@@ -147,6 +145,7 @@
        //同步导购绑定信息
        if(StringUtils.isNotBlank(phone)){
            customerUserService.syncByPhone(member);
            member = memberService.getMemberInfo(getMemberId());
        }
        return  ApiResponse.success("更新成功",member);
    }

 server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java

@@ -89,10 +89,6 @@
    }






    @UserLoginRequired
    @ApiOperation(value = "【B端小程序】每日上新数据")
    @GetMapping("/getDailyUpdates")