From cc9d558c8cda42d53be7b4545d2f33db26edf777 Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Thu, 28 May 2020 16:46:18 +0800
Subject: [PATCH] Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/chonggaoxiao/new_excoin.git
---
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 138 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 131 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
index 5fc8ceb..29453ea 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
@@ -11,11 +11,19 @@
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.modules.member.parameter.dto.MemberAuthenticationDto;
+import com.xcong.excoin.modules.member.parameter.dto.MemberDelPaymethodDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberForgetPwdDto;
+import com.xcong.excoin.modules.member.parameter.dto.MemberPaymethodDto;
+import com.xcong.excoin.modules.member.parameter.dto.MemberUpdatePwdDto;
+import com.xcong.excoin.modules.member.parameter.dto.MemberUpdateTradePwdDto;
import com.xcong.excoin.modules.member.parameter.vo.MemberInfoVo;
+import com.xcong.excoin.modules.member.parameter.vo.MemberPaymethodDetailListVo;
+import com.xcong.excoin.modules.member.parameter.vo.MemberPaymethodDetailVo;
import com.xcong.excoin.modules.member.service.MemberService;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
@@ -49,22 +57,27 @@
/**
* 忘记密码
- * @param code 验证码
- * @param password 新密码
- * @param token 用户登录的token
* @return
*/
@ApiOperation(value=" 忘记密码", notes=" 忘记密码")
- @RequestMapping(value="/memberForgetPwd")
+ @PostMapping(value="/memberForgetPwd")
public Result memberForgetPwd(@RequestBody @Valid MemberForgetPwdDto memberForgetPwdDto) {
return memberService.memberForgetPwd(memberForgetPwdDto);
}
/**
+ * 修改密码
+ * @return
+ */
+ @ApiOperation(value="修改密码", notes="修改密码")
+ @PostMapping(value="/memberUpdatePwd")
+ public Result memberUpdatePwd(@RequestBody @Valid MemberUpdatePwdDto memberUpdatePwdDto) {
+ //System.out.println("修改密码:");
+ return memberService.memberUpdatePwd(memberUpdatePwdDto);
+ }
+
+ /**
* 实名认证
- * @param token
- * @param memberAuthenVo
- * @param request
* @return
*/
@ApiOperation(value="实名认证", notes="实名认证")
@@ -73,6 +86,117 @@
return memberService.memberAuthentication(memberAuthenticationDto);
}
+ /**
+ * 修改资金密码
+ * @return
+ */
+ @ApiOperation(value="修改资金密码", notes="修改资金密码")
+ @PostMapping(value="/memberUpdateTradePwd")
+ public Result memberUpdateTradePwd(@RequestBody @Valid MemberUpdateTradePwdDto memberUpdateTradePwdDto) {
+ return memberService.memberUpdateTradePwd(memberUpdateTradePwdDto);
+ }
+
+ /**
+ * 用户退出登录
+ * @return
+ */
+ @ApiOperation(value="用户退出登录", notes="用户退出登录")
+ @GetMapping(value = "/memberLogout")
+ public Result memberLogout() {
+ return memberService.memberLogout();
+ }
+
+ /**
+ * 设置交易密码
+ * @param code
+ * @param password
+ * @param token
+ * @return
+ */
+ @ApiOperation(value="设置交易密码", notes="设置交易密码")
+ @PostMapping(value="/memberTradersPwd")
+ public Result memberTradersPwd(@RequestBody @Valid MemberForgetPwdDto memberForgetPwdDto) {
+ return memberService.memberTradersPwd(memberForgetPwdDto);
+ }
+
+ /**
+ * 收款方式
+ * @return
+ */
+ @ApiOperation(value="新增收款方式", notes="新增收款方式")
+ @PostMapping(value="/memberAddPaymethod")
+ public Result memberAddPaymethod(@RequestBody @Valid MemberPaymethodDto memberPaymethodDto) {
+ return memberService.memberAddPaymethod(memberPaymethodDto);
+ }
+
+ /**
+ * 收款方式
+ * @return
+ */
+ @ApiOperation(value="删除收款方式", notes="删除收款方式")
+ @PostMapping(value="/memberDelPaymethod")
+ public Result memberDelPaymethod(@RequestBody @Valid MemberDelPaymethodDto memberDelPaymethodDto) {
+ return memberService.memberDelPaymethod(memberDelPaymethodDto);
+ }
+
+ /**
+ * 收款方式
+ * @return
+ */
+ @ApiOperation(value="一个收款方式的详情", notes="一个收款方式的详情")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberPaymethodDetailVo.class)})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "long", paramType="query")
+ })
+ @GetMapping(value = "/memberPaymethodDetail")
+ public Result memberPaymethodDetail(long id) {
+ return memberService.memberPaymethodDetail(id);
+ }
+
+ /**
+ * 收款方式
+ * @return
+ */
+ @ApiOperation(value="收款方式的列表", notes="收款方式的列表")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberPaymethodDetailListVo.class)})
+ @GetMapping(value = "/memberPaymethodDetailList")
+ public Result memberPaymethodDetailList() {
+ return memberService.memberPaymethodDetailList();
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
}
--
Gitblit v1.9.1