From e9bcfdba00460e64307f422bd08303a07b90a288 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 28 May 2022 16:18:54 +0800
Subject: [PATCH] Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz
---
src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
index 83e6992..ede4051 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
@@ -8,10 +8,7 @@
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.ICommonService;
import cc.mrbird.febs.mall.service.IMallMemberWithdrawService;
-import cc.mrbird.febs.mall.vo.MallMemberVo;
-import cc.mrbird.febs.mall.vo.MoneyFlowVo;
-import cc.mrbird.febs.mall.vo.MyCommissionVo;
-import cc.mrbird.febs.mall.vo.TeamListVo;
+import cc.mrbird.febs.mall.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -73,12 +70,13 @@
@ApiOperation(value = "我的团队列表")
@ApiResponses({
- @ApiResponse(code = 200, message = "success", response = TeamListVo.class)
+ @ApiResponse(code = 200, message = "success", response = MyTeamVo.class)
})
@PostMapping(value = "/teamList")
public FebsResponse teamList(@RequestBody TeamListDto teamListDto) {
return memberService.teamList(teamListDto);
}
+
@ApiOperation(value = "资金流水列表")
@ApiResponses({
@@ -96,6 +94,15 @@
return new FebsResponse().success().message("转账成功");
}
+ @ApiOperation(value = "提现规则", notes = "提现规则")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = CashOutSettingVo.class)
+ })
+ @GetMapping(value = "/cashOutSetting")
+ public FebsResponse cashOutSetting() {
+ return new FebsResponse().success().data(memberService.cashOutSetting());
+ }
+
@ApiOperation(value = "提现")
@PostMapping(value = "/withdrawal")
public FebsResponse withdrawal(@RequestBody @Validated WithdrawalDto withdrawalDto) {
--
Gitblit v1.9.1