Merge remote-tracking branch 'origin/master'

doum

14 小时以前 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1

 server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java

@@ -47,6 +47,16 @@
        return  ApiResponse.success(memberService.wxLogin(code,recId));
    }

    @LoginRequired
    @ApiOperation(value = "绑定手机号", notes = "小程序端")
    @PostMapping("/wxPhone")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<AccountResponse> wxPhone(@Valid @RequestBody WxPhoneRequest wxPhoneRequest) {
        return  ApiResponse.success(memberService.wxPhone(wxPhoneRequest));
    }

    @ApiOperation(value = "测试登陆接口", notes = "小程序端")
    @GetMapping("/testLogin")
    @ApiImplicitParams({
@@ -56,17 +66,6 @@
        return  ApiResponse.success(memberService.wxLoginTest(memberId));
    }

    @LoginRequired
    @ApiOperation(value = "绑定手机号", notes = "小程序端")
    @PostMapping("/wxPhone")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse wxLogin(@Valid @RequestBody WxPhoneRequest wxPhoneRequest) {
        wxPhoneRequest.setMemberId(getMemberId());
        memberService.wxPhone(wxPhoneRequest);
        return  ApiResponse.success("绑定成功");
    }

    @LoginRequired
    @ApiOperation(value = "更新用户信息", notes = "小程序端")