From 89b7fb1d316cfce7eb98a27c8d668da493933f7f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 25 Feb 2022 16:29:07 +0800
Subject: [PATCH] 20222223

---
 src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java |   73 +++++++++++++++++-------------------
 1 files changed, 34 insertions(+), 39 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 1aeb253..b5f50d1 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
@@ -3,36 +3,13 @@
 import javax.annotation.Resource;
 import javax.validation.Valid;
 
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.xcong.excoin.modules.coin.parameter.dto.RecordsPageDto;
+import com.xcong.excoin.modules.member.parameter.dto.*;
+import com.xcong.excoin.modules.member.parameter.vo.*;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
 import com.xcong.excoin.common.response.Result;
-import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressDto;
-import com.xcong.excoin.modules.member.parameter.dto.MemberAuthenticationDto;
-import com.xcong.excoin.modules.member.parameter.dto.MemberBindEmailDto;
-import com.xcong.excoin.modules.member.parameter.dto.MemberBindPhoneDto;
-import com.xcong.excoin.modules.member.parameter.dto.MemberDelCoinAddressDto;
-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;
-import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressListVo;
-import com.xcong.excoin.modules.member.parameter.vo.MemberCoinInfoListVo;
-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.parameter.vo.MemberPersonCenterInfoVo;
-import com.xcong.excoin.modules.member.parameter.vo.MemberSendCodeWayVo;
 import com.xcong.excoin.modules.member.service.MemberService;
 
 import io.swagger.annotations.Api;
@@ -50,6 +27,7 @@
  * @date 2020-05-18
  **/
 @Slf4j
+@CrossOrigin("*")
 @Api(value = "个人中心接口", tags = "个人中心接口")
 @RestController
 @RequestMapping(value = "/api/member")
@@ -61,13 +39,25 @@
 	/**
 	 *  获取当前版本号
 	 */
-	@ApiOperation(value="获取当前版本号", notes="获取当前版本号")
+	@ApiOperation(value="APP端获取当前版本号", notes="获取当前版本号")
 	@ApiResponses({@ApiResponse( code = 200, message = "success", response = AppVersionListVo.class)})
 	@GetMapping(value = "/getAppVersionInfo")
 	public Result  getAppVersionInfo() {
 		return memberService.getAppVersionInfo();
 	}
-	
+
+
+	/**
+	 *  获取当前版本号
+	 */
+	@ApiOperation(value="PC端获取当前版本号", notes="获取当前版本号")
+	@ApiResponses({@ApiResponse( code = 200, message = "success", response = AppVersionListVo.class)})
+	@GetMapping(value = "/getPcVersionInfo")
+	public Result  getPcVersionInfo() {
+		return memberService.getPcVersionInfo();
+	}
+
+
 	/**
 	 *  获取我的信息
 	 * @return
@@ -168,9 +158,6 @@
 	
 	/**
 	 * 设置交易密码	
-	 * @param code
-	 * @param password
-	 * @param token
 	 * @return
 	 */
 	@ApiOperation(value="设置交易密码", notes="设置交易密码")
@@ -240,7 +227,7 @@
      */
 	@ApiOperation(value="绑定邮箱", notes="绑定邮箱")
 	@PostMapping(value="/memberBindEmail")
-    public Result memberBindEmail(@RequestBody @Valid MemberBindEmailDto memberBindEmailDto) {
+    public Result memberBindEmail(@RequestBody @Validated MemberBindEmailDto memberBindEmailDto) {
         return memberService.memberBindEmail(memberBindEmailDto);
     }
 	
@@ -324,8 +311,6 @@
     
     /**
 	 * 	提币币种可用资金
-	 * @param token
-	 * @param coinVo
 	 * @return
 	 */
     @ApiOperation(value = "提币币种可用资金", notes = "提币币种可用资金")
@@ -340,14 +325,24 @@
     
     /**
 	 * 	提币申请
-	 * @param token
-	 * @param coinVo
 	 * @return
 	 */
     @ApiOperation(value="提交提币申请", notes="提交提币申请")
 	@PostMapping(value="/memberSubmitCoinApply")
 	public Result memberSubmitCoinApply(@RequestBody @Valid MemberSubmitCoinApplyDto memberSubmitCoinApplyDto) {
-		return memberService.memberSubmitCoinApply(memberSubmitCoinApplyDto);
+    	return Result.fail("暂未开放提币");
+//		return memberService.memberSubmitCoinApply(memberSubmitCoinApplyDto);
+	}
+
+	/**
+	 * 我的直属团队
+	 * @return
+	 */
+	@ApiOperation(value = "我的直属团队", notes = "我的直属团队")
+	@ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberTeamVo.class)})
+	@PostMapping(value="/memberTeam")
+	public Result  memberTeam(@RequestBody @Valid MemberTeamRecordsPageDto memberTeamRecordsPageDto) {
+		return memberService.memberTeam(memberTeamRecordsPageDto);
 	}
     
 }

--
Gitblit v1.9.1