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

MrShi

7 天以前 e685b58fd40cf28a20844643d70cc5f5b46ca037

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

@@ -43,14 +43,14 @@
    @Autowired
    private MemberService memberService;

    @Autowired
    private IdentityInfoService identityInfoService;
//    @Autowired
//    private IdentityInfoService identityInfoService;

    @Autowired
    private MemberRevenueService memberRevenueService;

    @Autowired
    private WithdrawalOrdersService withdrawalOrdersService;
//    @Autowired
//    private MemberRevenueService memberRevenueService;
//
//    @Autowired
//    private WithdrawalOrdersService withdrawalOrdersService;


    @ApiOperation(value = "获取系统配置", notes = "小程序端")
@@ -83,80 +83,80 @@
        return  ApiResponse.success("操作成功");
    }

    @LoginRequired
    @ApiOperation(value = "切换用工身份", notes = "小程序端")
    @PostMapping("/editUseIdentity")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse editUseIdentity(@RequestBody Member member) {
        member.setId(getMemberId());
        memberService.editUseIdentity(member);
        return  ApiResponse.success("操作成功");
    }
//    @LoginRequired
//    @ApiOperation(value = "切换用工身份", notes = "小程序端")
//    @PostMapping("/editUseIdentity")
//    @ApiImplicitParams({
//            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
//    })
//    public ApiResponse editUseIdentity(@RequestBody Member member) {
//        member.setId(getMemberId());
//        memberService.editUseIdentity(member);
//        return  ApiResponse.success("操作成功");
//    }



    @LoginRequired
    @ApiOperation(value = "获取身份认证信息", notes = "小程序端")
    @GetMapping("/getIdentityInfo")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<IdentityInfo> getIdentityInfo(@RequestParam Integer type) {
        return  ApiResponse.success("查询成功",identityInfoService.findByMemberType(type,getMemberId()));
    }
//    @LoginRequired
//    @ApiOperation(value = "获取身份认证信息", notes = "小程序端")
//    @GetMapping("/getIdentityInfo")
//    @ApiImplicitParams({
//            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
//    })
//    public ApiResponse<IdentityInfo> getIdentityInfo(@RequestParam Integer type) {
//        return  ApiResponse.success("查询成功",identityInfoService.findByMemberType(type,getMemberId()));
//    }


    @LoginRequired
    @ApiOperation(value = "申请身份信息", notes = "小程序端")
    @PostMapping("/applyForIdentity")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse applyForIdentity(@RequestBody IdentityInfo identityInfo) {
        identityInfo.setMemberId(getMemberId());
        identityInfoService.create(identityInfo);
        return  ApiResponse.success("操作成功");
    }
//    @LoginRequired
//    @ApiOperation(value = "申请身份信息", notes = "小程序端")
//    @PostMapping("/applyForIdentity")
//    @ApiImplicitParams({
//            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
//    })
//    public ApiResponse applyForIdentity(@RequestBody IdentityInfo identityInfo) {
//        identityInfo.setMemberId(getMemberId());
//        identityInfoService.create(identityInfo);
//        return  ApiResponse.success("操作成功");
//    }



    @LoginRequired
    @ApiOperation(value = "修改身份信息（认证失败后使用）", notes = "小程序端")
    @PostMapping("/updateIdentity")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse updateIdentity(@RequestBody IdentityInfo identityInfo) {
        identityInfo.setMemberId(getMemberId());
        identityInfoService.updateById(identityInfo);
        return  ApiResponse.success("操作成功");
    }
//    @LoginRequired
//    @ApiOperation(value = "修改身份信息（认证失败后使用）", notes = "小程序端")
//    @PostMapping("/updateIdentity")
//    @ApiImplicitParams({
//            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
//    })
//    public ApiResponse updateIdentity(@RequestBody IdentityInfo identityInfo) {
//        identityInfo.setMemberId(getMemberId());
//        identityInfoService.updateById(identityInfo);
//        return  ApiResponse.success("操作成功");
//    }


    @LoginRequired
    @ApiOperation(value = "修改身份信息位置（认证成功后使用）", notes = "小程序端")
    @PostMapping("/updateLocation")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse updateLocation(@RequestBody IdentityInfo identityInfo) {
        identityInfo.setMemberId(getMemberId());
        identityInfoService.updateLocation(identityInfo);
        return  ApiResponse.success("操作成功");
    }
//    @LoginRequired
//    @ApiOperation(value = "修改身份信息位置（认证成功后使用）", notes = "小程序端")
//    @PostMapping("/updateLocation")
//    @ApiImplicitParams({
//            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
//    })
//    public ApiResponse updateLocation(@RequestBody IdentityInfo identityInfo) {
//        identityInfo.setMemberId(getMemberId());
//        identityInfoService.updateLocation(identityInfo);
//        return  ApiResponse.success("操作成功");
//    }

    @LoginRequired
    @ApiOperation("余额明细")
    @PostMapping("/revenuePage")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<PageData<MemberRevenue>> revenuePage (@RequestBody PageWrap<MemberRevenue> pageWrap) {
        pageWrap.getModel().setMemberId(this.getMemberId());
        return ApiResponse.success(memberRevenueService.findPage(pageWrap));
    }
//    @LoginRequired
//    @ApiOperation("余额明细")
//    @PostMapping("/revenuePage")
//    @ApiImplicitParams({
//            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
//    })
//    public ApiResponse<PageData<MemberRevenue>> revenuePage (@RequestBody PageWrap<MemberRevenue> pageWrap) {
//        pageWrap.getModel().setMemberId(this.getMemberId());
//        return ApiResponse.success(memberRevenueService.findPage(pageWrap));
//    }