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

liukangdong

2024-09-29 b2d360d9113b6955287108ca9e90d76a1f3c1419

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

@@ -92,9 +92,10 @@
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "phone", value = "手机号", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "短信验证码", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "openid", value = "openid", required = false),
    })
    public ApiResponse<AccountResponse> loginByPhone(@RequestParam String phone,@RequestParam String code) {
        return  ApiResponse.success(usersService.phoneLogin(phone,code));
    public ApiResponse<AccountResponse> loginByPhone(@RequestParam String phone,@RequestParam String code,String openid) {
        return  ApiResponse.success(usersService.phoneLogin(phone,code,openid));
    }


@@ -103,10 +104,10 @@
    @GetMapping("/bindingOpenid")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "微信code", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "openid", value = "openid", required = true),
    })
    public ApiResponse bindingOpenid(@RequestParam String code) {
        usersService.bindingOpenid(code,getUserId());
    public ApiResponse bindingOpenid(@RequestParam String openid) {
        usersService.bindingOpenid(openid,getUserId());
        return  ApiResponse.success("操作成功");
    }

@@ -151,6 +152,16 @@
    }

    @UserLoginRequired
    @ApiOperation(value = "获取员工管理门店列表", notes = "员工端小程序")
    @GetMapping("/userShopList")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<List<Shop>> userShopList () {
        return ApiResponse.success(shopService.getUserShopList(getMemberId()));
    }

    @UserLoginRequired
    @ApiOperation(value = "门店详情", notes = "员工端小程序")
    @GetMapping("/shopDetail")
    @ApiImplicitParams({