From 10ad2e710d2bd52aac31d5d63a7bb6beae76b6a8 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 07 Nov 2023 14:35:32 +0800
Subject: [PATCH] 用户列表增加搜索条件

---
 src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java |   79 ++++++++++++++++++++++++++++++++++-----
 1 files changed, 69 insertions(+), 10 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..d531e57 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;
@@ -29,6 +26,7 @@
  **/
 @Slf4j
 @RestController
+@CrossOrigin("*")
 @RequestMapping(value = "/api/member")
 @RequiredArgsConstructor
 @Api(value = "ApiMallMemberController", tags = "商城用户接口类")
@@ -73,12 +71,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,10 +95,26 @@
         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) {
         mallMemberWithdrawService.withdrawal(withdrawalDto);
+        return new FebsResponse().success().message("提交成功");
+    }
+
+    @ApiOperation(value = "H金劵转余额")
+    @PostMapping(value = "/withdrawalScore")
+    public FebsResponse withdrawalScore(@RequestBody @Validated WithdrawalScoreDto withdrawalScoreDto) {
+        mallMemberWithdrawService.withdrawalScore(withdrawalScoreDto);
         return new FebsResponse().success().message("提交成功");
     }
 
@@ -123,16 +138,17 @@
         return new FebsResponse().success().message("绑定成功");
     }
 
-    @ApiOperation(value = "可提现金额")
-    @GetMapping(value = "/canWithdrawal")
-    public FebsResponse canWithdrawal() {
-        return new FebsResponse().success().data(memberService.canMoney());
+    @ApiOperation(value = "可提现金额 1:余额 2：H金劵")
+    @GetMapping(value = "/canWithdrawal/{type}")
+    public FebsResponse canWithdrawal(@PathVariable("type") int type) {
+        return new FebsResponse().success().data(memberService.canMoney(type));
     }
 
     @ApiOperation(value = "用户消费排名")
     @PostMapping(value = "/findRankList")
     public FebsResponse findRankList(@RequestBody RankListDto rankListDto) {
-        return new FebsResponse().success().data(memberService.findRankList(rankListDto));
+//        return new FebsResponse().success().data(memberService.findRankList(rankListDto));
+        return new FebsResponse().success();
     }
 
     @ApiOperation(value = "根据邀请码或者手机号获取昵称")
@@ -163,4 +179,47 @@
     public FebsResponse myCommission() {
         return new FebsResponse().success().data(memberService.myCommission());
     }
+
+    @ApiOperation(value = "商铺申请是否存在")
+    @PostMapping(value = "/shopApplyIsExist")
+    public FebsResponse shopApplyIsExist() {
+        return null;
+    }
+
+    @ApiOperation(value = "新增银行卡")
+    @PostMapping(value = "/addMemberBank")
+    public FebsResponse addMemberBank(@RequestBody AddMemberBankDto addMemberBankDto) {
+        return memberService.addMemberBank(addMemberBankDto);
+    }
+
+    @ApiOperation(value = "银行卡列表", notes = "银行卡列表")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "success", response = MemberBankListVo.class)
+    })
+    @PostMapping(value = "/memberBankList")
+    public FebsResponse memberBankList(@RequestBody MemberBankListDto memberBankListDto) {
+        return memberService.findMemberBankList(memberBankListDto);
+    }
+
+    @ApiOperation(value = "银行卡详情", notes = "银行卡详情")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "success", response = MemberBankListVo.class)
+    })
+    @GetMapping(value = "/memberBankDetails/{id}")
+    public FebsResponse memberBankDetails(@PathVariable("id") Long id) {
+        return memberService.findBankDetailsById(id);
+    }
+
+    @ApiOperation(value = "更新银行卡")
+    @PostMapping(value = "/updateMemberBank")
+    public FebsResponse updateMemberBank(@RequestBody UpdateMemberBankDto updateMemberBankDto) {
+        return memberService.updateMemberBank(updateMemberBankDto);
+    }
+
+    @ApiOperation(value = "删除银行卡", notes = "删除银行卡")
+    @PostMapping(value = "/delMemberBank/{id}")
+    public FebsResponse delMemberBank(@PathVariable("id") Long id) {
+        return memberService.delMemberBank(id);
+    }
+
 }

--
Gitblit v1.9.1