From ee98d0782c94e000fe2c2524d1957f67c6a5e70b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 12 May 2022 18:08:18 +0800
Subject: [PATCH] add apply

---
 src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java |   65 +++++++++++++++++++++++++++++---
 1 files changed, 59 insertions(+), 6 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 ef1e0cb..3d5afc2 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
@@ -2,11 +2,13 @@
 
 import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.mall.dto.*;
+import cc.mrbird.febs.mall.entity.MallMember;
 import cc.mrbird.febs.mall.entity.MallMemberPayment;
 import cc.mrbird.febs.mall.service.IApiMallMemberService;
-import cc.mrbird.febs.mall.vo.MallMemberVo;
-import cc.mrbird.febs.mall.vo.MoneyFlowVo;
-import cc.mrbird.febs.mall.vo.TeamListVo;
+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.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -30,6 +32,8 @@
 public class ApiMallMemberController {
 
     private final IApiMallMemberService memberService;
+    private final IMallMemberWithdrawService mallMemberWithdrawService;
+    private final IApiMallMemberWalletService walletService;
 
     @ApiOperation(value = "获取商城用户信息", notes = "获取商城用户信息")
     @ApiResponses({
@@ -60,18 +64,19 @@
 
     @ApiOperation(value = "修改用户信息")
     @PostMapping(value = "/modifyInfo")
-    public FebsResponse modifyInfo(ModifyMemberInfoDto modifyMemberInfoDto) {
+    public FebsResponse modifyInfo(@RequestBody ModifyMemberInfoDto modifyMemberInfoDto) {
         return memberService.modifyMemberInfo(modifyMemberInfoDto);
     }
 
     @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({
@@ -92,7 +97,7 @@
     @ApiOperation(value = "提现")
     @PostMapping(value = "/withdrawal")
     public FebsResponse withdrawal(@RequestBody @Validated WithdrawalDto withdrawalDto) {
-        memberService.withdrawal(withdrawalDto);
+        mallMemberWithdrawService.withdrawal(withdrawalDto);
         return new FebsResponse().success().message("提交成功");
     }
 
@@ -108,4 +113,52 @@
     public FebsResponse findPayment() {
         return new FebsResponse().success().data(memberService.findMemberPayment());
     }
+
+    @ApiOperation(value = "绑定手机号")
+    @PostMapping(value = "/bindPhone")
+    public FebsResponse bindPhone(@RequestBody AccountAndCodeDto accountAndCodeDto) {
+        memberService.bindPhone(accountAndCodeDto);
+        return new FebsResponse().success().message("绑定成功");
+    }
+
+    @ApiOperation(value = "可提现金额")
+    @GetMapping(value = "/canWithdrawal")
+    public FebsResponse canWithdrawal() {
+        return new FebsResponse().success().data(memberService.canMoney());
+    }
+
+    @ApiOperation(value = "用户消费排名")
+    @PostMapping(value = "/findRankList")
+    public FebsResponse findRankList(@RequestBody RankListDto rankListDto) {
+        return new FebsResponse().success().data(memberService.findRankList(rankListDto));
+    }
+
+    @ApiOperation(value = "根据邀请码或者手机号获取昵称")
+    @PostMapping(value = "/findMemberInfoByAccount/{phone}")
+    public FebsResponse findMemberInfoByAccount(@PathVariable("phone") String phone) {
+        MallMember account = memberService.findMemberInfoByAccount(phone);
+        if (account == null) {
+            return new FebsResponse().fail().message("用户不存在");
+        }
+
+        MallMemberVo member = new MallMemberVo();
+        member.setName(account.getName());
+        return new FebsResponse().success().data(member);
+    }
+
+    @ApiOperation(value = "佣金划转")
+    @PostMapping(value = "/commissionChange")
+    public FebsResponse commissionChange(@RequestBody @Validated CommissionChangeDto commissionChange) {
+        walletService.commissionChange(commissionChange);
+        return new FebsResponse().success();
+    }
+
+    @ApiOperation(value = "我的权益")
+    @ApiResponses(
+            @ApiResponse(code = 200, message = "success", response = MyCommissionVo.class)
+    )
+    @PostMapping(value = "/myCommission")
+    public FebsResponse myCommission() {
+        return new FebsResponse().success().data(memberService.myCommission());
+    }
 }

--
Gitblit v1.9.1