From 7c6f033b8754b07bf5c75ae8745a982d76f9abb4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 23 Sep 2022 19:28:14 +0800
Subject: [PATCH] Merge branch 'group_buy' of http://120.27.238.55:7000/r/xc-mall into group_buy
---
src/main/java/cc/mrbird/febs/mall/controller/ApiMallTeamLeaderController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallTeamLeaderController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallTeamLeaderController.java
index 01dbe83..fdee968 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallTeamLeaderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallTeamLeaderController.java
@@ -4,10 +4,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.service.IApiMallTeamLeaderService;
-import cc.mrbird.febs.mall.vo.ApiLeaderInfoVo;
-import cc.mrbird.febs.mall.vo.ApiLeaderListVo;
-import cc.mrbird.febs.mall.vo.ApiMallleaderStateVo;
-import cc.mrbird.febs.mall.vo.OrderListVo;
+import cc.mrbird.febs.mall.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -38,16 +35,29 @@
return iApiMallTeamLeaderService.applyLeader(apiApplayLeaderDto);
}
+
/**
* 团长列表
*/
- @ApiOperation(value = "团长列表", notes = "团长列表")
+ @ApiOperation(value = "团长列表(查询当前位置商品配送范围内的所有团长)", notes = "团长列表(查询当前位置商品配送范围内的所有团长)")
@ApiResponses({
@ApiResponse(code = 200, message = "success", response = ApiLeaderListVo.class)
})
@PostMapping(value = "/leaderList")
public FebsResponse leaderList(@RequestBody @Valid ApiLeaderListDto apiLeaderListDto) {
- return new FebsResponse().success().data(iApiMallTeamLeaderService.findLeaderListInPage(apiLeaderListDto));
+ return iApiMallTeamLeaderService.findSomeLeaderListInPage(apiLeaderListDto);
+ }
+
+ /**
+ * 团长列表
+ */
+ @ApiOperation(value = "团长列表(查询当前经纬度在团长配送范围内的团长)", notes = "团长列表(查询当前经纬度在团长配送范围内的团长)")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = ApiLeaderListVo.class)
+ })
+ @PostMapping(value = "/leaderListInFence")
+ public FebsResponse leaderListInFence(@RequestBody @Valid ApiLeaderListDto apiLeaderListDto) {
+ return iApiMallTeamLeaderService.findLeaderListInPage(apiLeaderListDto);
}
/**
@@ -124,11 +134,47 @@
return iApiMallTeamLeaderService.leaderTitle(apiLeaderTitleDto);
}
+ /**
+ * 商品列表页的团长信息
+ * 有团长特征码直接显示该团长，
+ * 有经纬度，按照经纬度选择距离最近的
+ * 没有选择团长列表的第一个
+ */
+ @ApiOperation(value = "商品列表页的团长信息", notes = "商品列表页的团长信息")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = ApiLeaderInfoVo.class)
+ })
+ @PostMapping("/noLoginLeaderTitle")
+ public FebsResponse noLoginLeaderTitle(@RequestBody ApiLeaderTitleDto apiLeaderTitleDto) {
+ return iApiMallTeamLeaderService.noLoginLeaderTitle(apiLeaderTitleDto);
+ }
+
@ApiOperation(value = "获取团长订单角标数量")
@GetMapping(value = "/findTeamOrderMarkCnt")
public FebsResponse findTeamOrderMarkCnt() {
return iApiMallTeamLeaderService.findTeamOrderMarkCnt();
}
+ @ApiOperation(value = "团长收益详情", notes = "团长收益详情")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = ApiLeaderProfitVo.class)
+ })
+ @GetMapping("/leaderProfit")
+ public FebsResponse leaderProfit() {
+ return iApiMallTeamLeaderService.leaderProfit();
+ }
+
+ /**
+ * 团长查看已提成收益
+ */
+ @ApiOperation(value = "团长查看已提成收益", notes = "团长查看已提成收益")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = ApiOrderProfitVo.class)
+ })
+ @PostMapping(value = "/leaderProfitList")
+ public FebsResponse leaderProfitList(@RequestBody ApiOrderProfitDto apiOrderProfitDto) {
+ return new FebsResponse().success().data(iApiMallTeamLeaderService.findLeaderProfitListInPage(apiOrderProfitDto));
+ }
+
}
--
Gitblit v1.9.1