From a1ae9d712f1d18799c3e4e34995fd037f6c5a22a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 19 Jul 2023 16:56:32 +0800
Subject: [PATCH] 商城商品修改

---
 src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java |   36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 insertions(+), 4 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 79d6d3f..7593f5f 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
@@ -4,10 +4,7 @@
 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.service.*;
 import cc.mrbird.febs.mall.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,6 +23,7 @@
  **/
 @Slf4j
 @RestController
+@CrossOrigin("*")
 @RequestMapping(value = "/api/member")
 @RequiredArgsConstructor
 @Api(value = "ApiMallMemberController", tags = "商城用户接口类")
@@ -34,6 +32,7 @@
     private final IApiMallMemberService memberService;
     private final IMallMemberWithdrawService mallMemberWithdrawService;
     private final IApiMallMemberWalletService walletService;
+    private final IApiMallAgentService iApiMallAgentService;
 
     /**
      * 小程序接收用户数据,更新用户信息
@@ -192,4 +191,33 @@
         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 = "/agentApplyInfo")
+    public FebsResponse agentApplyInfo() {
+        return memberService.agentApplyInfo();
+    }
+
+    @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