Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

Helius

2021-07-15 bea4cd8cceb220189fd1fed5c2c1ff22d3e8a9ed

 gc-user/src/main/java/com/xzx/gc/user/controller/ApiDistribController.java

@@ -11,6 +11,8 @@
import com.xzx.gc.user.vo.HeadTeamVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -34,18 +36,24 @@

    @ApiOperation("加入团队")
    @PostMapping(value = "/distrib/join")
    public JsonResult<String> join(DistribJoinDto distribJoinDto, HttpServletRequest request) {
    public JsonResult<String> join(@RequestBody DistribJoinDto distribJoinDto, HttpServletRequest request) {
        distribService.join(distribJoinDto.getHeadId(), getUserId(request));
        return JsonResult.success();
    }

    @ApiOperation("获取团长信息")
    @ApiResponses({
            @ApiResponse(code = 200, message = "success", response = HeadInfoVo.class)
    })
    @PostMapping(value = "/distrib/headInfo")
    public JsonResult<HeadInfoVo> headInfo(HttpServletRequest request) {
        return JsonResult.success(distribService.findHeadInfo(getUserId(request)));
    }

    @ApiOperation("我的收益")
    @ApiResponses({
            @ApiResponse(code = 200, message = "success", response = HeadProfitListVo.class)
    })
    @PostMapping(value = "/distrib/headProfit")
    public JsonResult<List<HeadProfitListVo>> headProfitList(@RequestBody HeadProfitLitDto headProfitLitDto, HttpServletRequest request) {
        headProfitLitDto.setUserId(getUserId(request));
@@ -53,6 +61,9 @@
    }

    @ApiOperation("我的团队")
    @ApiResponses({
            @ApiResponse(code = 200, message = "success", response = HeadProfitListVo.class)
    })
    @PostMapping(value = "/distrib/headTeam")
    public JsonResult<List<HeadTeamVo>> headTimeList(@RequestBody HeadTeamDto headTeamDto, HttpServletRequest request) {
        headTeamDto.setUserId(getUserId(request));