From 3064a503bc6d0030c1f812d57c4ba2cb7a650fea Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 02 Sep 2022 14:27:45 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java | 70 ++++++++++++++++++++++++++++++++---
1 files changed, 64 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 bede37d..79d6d3f 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
@@ -2,12 +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.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.ICommonService;
-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.IMallMemberWithdrawService;
+import cc.mrbird.febs.mall.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -31,7 +32,18 @@
public class ApiMallMemberController {
private final IApiMallMemberService memberService;
+ private final IMallMemberWithdrawService mallMemberWithdrawService;
+ private final IApiMallMemberWalletService walletService;
+ /**
+ * 小程序接收用户数据，更新用户信息
+ */
+ @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)
@@ -67,12 +79,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({
@@ -90,10 +103,19 @@
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) {
- memberService.withdrawal(withdrawalDto);
+ mallMemberWithdrawService.withdrawal(withdrawalDto);
return new FebsResponse().success().message("提交成功");
}
@@ -132,6 +154,42 @@
@ApiOperation(value = "根据邀请码或者手机号获取昵称")
@PostMapping(value = "/findMemberInfoByAccount/{phone}")
public FebsResponse findMemberInfoByAccount(@PathVariable("phone") String phone) {
- return new FebsResponse().success().data(memberService.findMemberInfoByAccount(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());
+ }
+
+ @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);
+ }
+
}
--
Gitblit v1.9.1