From 1598aa79d68143f73c1b406f463c55e5e5d02433 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 29 Jun 2020 16:55:43 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin

---
 src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java |   52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 51 insertions(+), 1 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 467d131..1aeb253 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
@@ -18,8 +18,11 @@
 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.MemberSubmitCoinApplyDto;
 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.dto.MemberUpdateTradersPwdTimeDto;
+import com.xcong.excoin.modules.member.parameter.vo.AppVersionListVo;
 import com.xcong.excoin.modules.member.parameter.vo.MemberAuthenticationInfoVo;
 import com.xcong.excoin.modules.member.parameter.vo.MemberAvivableCoinInfoVo;
 import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressCountListVo;
@@ -53,7 +56,17 @@
 public class MemberController {
 	
 	@Resource
-	MemberService memberService; 
+	MemberService memberService;
+	
+	/**
+	 *  获取当前版本号
+	 */
+	@ApiOperation(value="获取当前版本号", notes="获取当前版本号")
+	@ApiResponses({@ApiResponse( code = 200, message = "success", response = AppVersionListVo.class)})
+	@GetMapping(value = "/getAppVersionInfo")
+	public Result  getAppVersionInfo() {
+		return memberService.getAppVersionInfo();
+	}
 	
 	/**
 	 *  获取我的信息
@@ -77,6 +90,20 @@
 	}
 	
 	/**
+	 *  验证账户是否存在
+	 * @return
+	 */
+	@ApiOperation(value="验证账户是否存在", notes="验证账户是否存在")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "account", value = "账号", required = true, dataType = "String", paramType="query"),
+		@ApiImplicitParam(name = "type", value = "类型  1:手机号 2:邮箱", required = true, dataType = "int", paramType="query")
+	})
+	@GetMapping(value = "/getMemberAccountInfo")
+	public Result  getMemberAccountInfo(String account,int type) {
+		return memberService.getMemberAccountInfo(account,type);
+	}
+	
+	/**
 	 * 修改密码
 	 * @return
 	 */
@@ -85,6 +112,17 @@
 	public Result  memberUpdatePwd(@RequestBody @Valid MemberUpdatePwdDto memberUpdatePwdDto) {
 		//System.out.println("修改密码:");
 		return memberService.memberUpdatePwd(memberUpdatePwdDto);
+	}
+	
+	/**
+	 * 修改资金密码时效性
+	 * @return
+	 */
+	@ApiOperation(value="修改资金密码时效性", notes="修改资金密码时效性")
+	@PostMapping(value="/memberUpdateTradersPwdTime")
+	public Result  memberUpdateTradersPwdTime(@RequestBody @Valid MemberUpdateTradersPwdTimeDto memberUpdateTradersPwdTimeDto) {
+		//System.out.println("修改密码:");
+		return memberService.memberUpdateTradersPwdTime(memberUpdateTradersPwdTimeDto);
 	}
 	
 	/**
@@ -300,4 +338,16 @@
 		return memberService.memberAvivableCoinInfo(symbol);
 	}
     
+    /**
+	 * 	提币申请
+	 * @param token
+	 * @param coinVo
+	 * @return
+	 */
+    @ApiOperation(value="提交提币申请", notes="提交提币申请")
+	@PostMapping(value="/memberSubmitCoinApply")
+	public Result memberSubmitCoinApply(@RequestBody @Valid MemberSubmitCoinApplyDto memberSubmitCoinApplyDto) {
+		return memberService.memberSubmitCoinApply(memberSubmitCoinApplyDto);
+	}
+    
 }

--
Gitblit v1.9.1