Merge remote-tracking branch 'origin/master'

doum

12 小时以前 e68e324f91d1a4eb2d4c5f07d27ca105a308bc0c

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

@@ -40,11 +40,20 @@
    @ApiOperation(value = "小程序登陆方式", notes = "小程序端")
    @GetMapping("/wxLogin")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "微信code", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "recId", value = "分享码", required = false)
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "微信code", required = true)
    })
    public ApiResponse<AccountResponse> wxLogin(@RequestParam String code, Integer recId) {
        return  ApiResponse.success(memberService.wxLogin(code,recId));
    public ApiResponse<AccountResponse> wxLogin(@RequestParam String code) {
        return  ApiResponse.success(memberService.wxLogin(code));
    }

    @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 = "小程序端")
@@ -56,17 +65,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 = "小程序端")