From bea4cd8cceb220189fd1fed5c2c1ff22d3e8a9ed Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 15 Jul 2021 17:16:16 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-user/src/main/java/com/xzx/gc/user/controller/ApiDistribController.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/gc-user/src/main/java/com/xzx/gc/user/controller/ApiDistribController.java b/gc-user/src/main/java/com/xzx/gc/user/controller/ApiDistribController.java
index 405159a..25e1a5f 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/controller/ApiDistribController.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/controller/ApiDistribController.java
@@ -3,16 +3,24 @@
import com.xzx.gc.common.request.BaseController;
import com.xzx.gc.model.JsonResult;
import com.xzx.gc.user.dto.DistribJoinDto;
+import com.xzx.gc.user.dto.HeadProfitLitDto;
+import com.xzx.gc.user.dto.HeadTeamDto;
import com.xzx.gc.user.service.DistribService;
import com.xzx.gc.user.vo.HeadInfoVo;
+import com.xzx.gc.user.vo.HeadProfitListVo;
+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;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author wzy
@@ -28,15 +36,38 @@
@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));
+ return JsonResult.success(distribService.findHeadProfitListInPage(headProfitLitDto));
+ }
+
+ @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));
+ return JsonResult.success(distribService.findHeadTeamListInPage(headTeamDto));
+ }
+
}
--
Gitblit v1.9.1