From c3f2f93821ac8d351fe7c9d1f0f28c39b36cfef1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 01 Mar 2023 18:01:06 +0800
Subject: [PATCH] 增加活动公告

---
 src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java |   68 +++++++++++++++++++++++++++++----
 1 files changed, 59 insertions(+), 9 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..b392bf8 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
@@ -4,14 +4,8 @@
 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.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.service.*;
+import cc.mrbird.febs.mall.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -37,7 +31,17 @@
     private final IApiMallMemberService memberService;
     private final IMallMemberWithdrawService mallMemberWithdrawService;
     private final IApiMallMemberWalletService walletService;
+    private final IApiMallAgentService iApiMallAgentService;
 
+    /**
+     * 小程序接收用户数据，更新用户信息
+     */
+    @ApiOperation(value = "小程序接收用户数据", notes = "小程序接收用户数据")
+    @PostMapping(value = "/xcxSaveInfo")
+    public FebsResponse xcxSaveInfo(@RequestBody ApiXcxSaveInfoDto apiXcxSaveInfoDto){
+        return memberService.xcxSaveInfo(apiXcxSaveInfoDto);
+    }
+    
     @ApiOperation(value = "获取商城用户信息", notes = "获取商城用户信息")
     @ApiResponses({
             @ApiResponse(code = 200, message = "success", response = MallMemberVo.class)
@@ -73,12 +77,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({
@@ -94,6 +99,15 @@
     public FebsResponse transfer(@RequestBody @Validated TransferDto transferDto) {
         memberService.transfer(transferDto);
         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 = "提现")
@@ -163,4 +177,40 @@
     public FebsResponse myCommission() {
         return new FebsResponse().success().data(memberService.myCommission());
     }
+
+    @ApiOperation(value = "商铺申请是否存在")
+    @PostMapping(value = "/shopApplyIsExist")
+    public FebsResponse shopApplyIsExist() {
+        return null;
+    }
+
+    @ApiOperation(value = "充值余额")
+    @PostMapping(value = "/rechargeWallet")
+    public FebsResponse rechargeWallet(@RequestBody @Validated ApiRechargeWalletDto apiRechargeWalletDto) {
+        return memberService.rechargeWallet(apiRechargeWalletDto);
+    }
+
+    /**
+     * 申请代理
+     * @param apiAgentApplyDto
+     * @return
+     */
+    @ApiOperation(value = "申请代理")
+    @PostMapping(value = "/agentApply")
+    public FebsResponse agentApply(@RequestBody @Validated ApiAgentApplyDto apiAgentApplyDto) {
+        return iApiMallAgentService.agentApply(apiAgentApplyDto);
+    }
+
+    @ApiOperation(value = "合伙人权益")
+    @GetMapping(value = "/agentDetail")
+    public FebsResponse agentDetail() {
+        return memberService.agentDetail();
+    }
+
+    @ApiOperation(value = "活动公告")
+    @GetMapping(value = "/activityInfo")
+    public FebsResponse activityInfo() {
+        return memberService.activityInfo();
+    }
+
 }

--
Gitblit v1.9.1