From a7962f680b606fbd200550bfda679f0957f3c447 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 27 Sep 2021 15:44:12 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 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 1031f9f..af38471 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
@@ -1,11 +1,11 @@
package cc.mrbird.febs.mall.controller;
import cc.mrbird.febs.common.entity.FebsResponse;
-import cc.mrbird.febs.mall.dto.ForgetPwdDto;
-import cc.mrbird.febs.mall.dto.ModifyMemberInfoDto;
-import cc.mrbird.febs.mall.dto.TeamListDto;
+import cc.mrbird.febs.mall.dto.*;
+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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -13,7 +13,10 @@
import io.swagger.annotations.ApiResponses;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
/**
* @author wzy
@@ -57,7 +60,7 @@
@ApiOperation(value = "修改用户信息")
@PostMapping(value = "/modifyInfo")
- public FebsResponse modifyInfo(ModifyMemberInfoDto modifyMemberInfoDto) {
+ public FebsResponse modifyInfo(@RequestBody ModifyMemberInfoDto modifyMemberInfoDto) {
return memberService.modifyMemberInfo(modifyMemberInfoDto);
}
@@ -67,6 +70,42 @@
})
@PostMapping(value = "/teamList")
public FebsResponse teamList(@RequestBody TeamListDto teamListDto) {
- return null;
+ return memberService.teamList(teamListDto);
+ }
+
+ @ApiOperation(value = "资金流水列表")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = MoneyFlowVo.class)
+ })
+ @PostMapping(value = "/moneyFlow")
+ public FebsResponse moneyFlow(@RequestBody MoneyFlowDto moneyFlowDto) {
+ return memberService.moneyFlows(moneyFlowDto);
+ }
+
+ @ApiOperation(value = "转账")
+ @PostMapping(value = "/transfer")
+ public FebsResponse transfer(@RequestBody @Validated TransferDto transferDto) {
+ memberService.transfer(transferDto);
+ return new FebsResponse().success().message("转账成功");
+ }
+
+ @ApiOperation(value = "提现")
+ @PostMapping(value = "/withdrawal")
+ public FebsResponse withdrawal(@RequestBody @Validated WithdrawalDto withdrawalDto) {
+ memberService.withdrawal(withdrawalDto);
+ return new FebsResponse().success().message("提交成功");
+ }
+
+ @ApiOperation(value = "设置收款方式")
+ @PostMapping(value = "/setPayment")
+ public FebsResponse setPayment(@RequestBody MallMemberPayment mallMemberPayment) {
+ memberService.setPayment(mallMemberPayment);
+ return new FebsResponse().success().message("设置成功");
+ }
+
+ @ApiOperation(value = "获取收款方式")
+ @GetMapping(value = "/findPayment")
+ public FebsResponse findPayment() {
+ return new FebsResponse().success().data(memberService.findMemberPayment());
}
}
--
Gitblit v1.9.1