From cd0deccf2831aad337705fc107ee123fcea7d971 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 20 Sep 2022 10:13:29 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/controller/ApiMallTeamLeaderController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 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 bb1ddd1..3354f45 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);
}
/**
@@ -92,8 +102,21 @@
*/
@ApiOperation(value = "团长点击到货确认，订单从状态 2 变更到状态 3 ，即待提货", notes = "团长点击到货确认，订单从状态 2 变更到状态 3 ，即待提货")
@PostMapping("/leaderOrderConfirm")
- public FebsResponse leaderOrderConfirm(@Valid ApiLeaderOrderConfirmDto apiLeaderOrderConfirmDto) {
+ public FebsResponse leaderOrderConfirm( @RequestBody @Valid ApiLeaderOrderConfirmDto apiLeaderOrderConfirmDto) {
return iApiMallTeamLeaderService.leaderOrderConfirm(apiLeaderOrderConfirmDto);
+ }
+
+
+ @ApiOperation(value = "团长点击用户退款", notes = "团长点击用户退款")
+ @PostMapping(value = "/leaderRefundOrder")
+ public FebsResponse leaderRefundOrder(@RequestBody ApiLeaderRefundOrderDto apiLeaderRefundOrderDto) {
+ return iApiMallTeamLeaderService.leaderRefundOrder(apiLeaderRefundOrderDto);
+ }
+
+ @ApiOperation(value = "团长退款详情", notes = "团长退款详情")
+ @PostMapping(value = "/refundOrderInfo")
+ public FebsResponse refundOrderInfo(@RequestBody ApiRefundOrderInfoDto apiRefundOrderInfoDto) {
+ return iApiMallTeamLeaderService.refundOrderInfo(apiRefundOrderInfoDto);
}
/**
@@ -117,5 +140,26 @@
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