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

liukangdong

2024-08-02 80122e49ea50302e86c663b00f9d5d04284c3372

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

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

    @LoginRequired
@@ -137,10 +142,11 @@
    })
    public ApiResponse<Member> binDingPhone(@RequestBody EditMemberRequest editMemberRequest) {
        editMemberRequest.setId(getMemberId());
        String phone =editMemberRequest.getPhone();
        Member member = memberService.updMemberPhone(editMemberRequest);
        //同步导购绑定信息
        if(StringUtils.isNotBlank(editMemberRequest.getPhone())){
            customerUserService.syncByPhone(editMemberRequest.getPhone());
        if(StringUtils.isNotBlank(phone)){
            customerUserService.syncByPhone(member);
        }
        return  ApiResponse.success("更新成功",member);
    }
@@ -154,7 +160,9 @@
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "phone", value = "手机号信息", required = true),
    })
    public ApiResponse syncCustomerUser(@RequestParam String phone) {
        customerUserService.syncByPhone(phone);
        if(StringUtils.isNotBlank(getLoginMemberInfo().getPhone())){
            customerUserService.syncByPhone(getLoginMemberInfo());
        }
        return  ApiResponse.success("同步成功");
    }