From 436c0695fea9a8d11c2a2f1da7abfafd834b40fb Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 20 Jul 2023 17:37:19 +0800
Subject: [PATCH] 购买民宿卷商品，支付完，订单就已经完成
---
src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 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..4da30b0 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,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.entity.MallRollPerk;
+import cc.mrbird.febs.mall.service.*;
import cc.mrbird.febs.mall.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -26,6 +24,7 @@
**/
@Slf4j
@RestController
+@CrossOrigin
@RequestMapping(value = "/api/member")
@RequiredArgsConstructor
@Api(value = "ApiMallMemberController", tags = "商城用户接口类")
@@ -34,6 +33,7 @@
private final IApiMallMemberService memberService;
private final IMallMemberWithdrawService mallMemberWithdrawService;
private final IApiMallMemberWalletService walletService;
+ private final IApiMallAgentService iApiMallAgentService;
/**
* 小程序接收用户数据，更新用户信息
@@ -192,4 +192,42 @@
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();
+ }
+
+ @ApiOperation(value = "获取卷列表", notes = "获取卷列表")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = MallRollPerk.class)
+ })
+ @PostMapping(value = "/rollPerkList")
+ public FebsResponse rollPerkList(@RequestBody ApiMallRollPerkDto queryDto) {
+ return new FebsResponse().success().data(memberService.findMallRollPerkInPage(queryDto));
+ }
+
}
--
Gitblit v1.9.1