From 36be00e0f3cbe0d559c646fd2977e6e3a74aa6f9 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Sep 2024 16:57:22 +0800
Subject: [PATCH] Merge branch 'bea' of http://120.27.238.55:7000/r/exchange into bea
---
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 152 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 115 insertions(+), 37 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 3512121..3affd5a 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,35 +3,14 @@
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 com.xcong.excoin.modules.member.vo.DefaultWayVo;
+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.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;
@@ -49,14 +28,37 @@
* @date 2020-05-18
**/
@Slf4j
+@CrossOrigin("*")
@Api(value = "个人中心接口", tags = "个人中心接口")
@RestController
@RequestMapping(value = "/api/member")
public class MemberController {
@Resource
- MemberService memberService;
+ MemberService memberService;
+ /**
+ * 获取当前版本号
+ */
+ @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
@@ -76,6 +78,20 @@
@PostMapping(value="/memberForgetPwd")
public Result memberForgetPwd(@RequestBody @Valid MemberForgetPwdDto memberForgetPwdDto) {
return memberService.memberForgetPwd(memberForgetPwdDto);
+ }
+
+ /**
+ * 验证账户是否存在
+ * @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);
}
/**
@@ -143,9 +159,6 @@
/**
* 设置交易密码
- * @param code
- * @param password
- * @param token
* @return
*/
@ApiOperation(value="设置交易密码", notes="设置交易密码")
@@ -198,6 +211,21 @@
public Result memberPaymethodDetailList() {
return memberService.memberPaymethodDetailList();
}
+
+ @ApiOperation(value = "设置为默认收款方式")
+ @PostMapping(value = "/setDefaultMethod/{id}")
+ public Result setDefaultMethod(@PathVariable("id") Long id) {
+ return memberService.setDefaultPaymethod(id);
+ }
+
+ @ApiOperation(value = "获取我的默认收款方式", notes = "获取我的默认收款方式")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "获取成功", response = DefaultWayVo.class)
+ })
+ @GetMapping(value = "/findDefaultWay")
+ public Result findDefaultWay() {
+ return memberService.findDefaultWay();
+ }
/**
* 绑定手机号
@@ -215,7 +243,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);
}
@@ -299,8 +327,6 @@
/**
* 提币币种可用资金
- * @param token
- * @param coinVo
* @return
*/
@ApiOperation(value = "提币币种可用资金", notes = "提币币种可用资金")
@@ -315,14 +341,66 @@
/**
* 提币申请
- * @param token
- * @param coinVo
* @return
*/
@ApiOperation(value="提交提币申请", notes="提交提币申请")
@PostMapping(value="/memberSubmitCoinApply")
public Result memberSubmitCoinApply(@RequestBody @Valid MemberSubmitCoinApplyDto 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);
+ }
+
+ /**
+ * 获取内转提币地址
+ * @return
+ */
+ @ApiOperation(value = "获取内转提币地址列表", notes = "获取内转提币地址列表")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberCoinAddressInListVo.class)})
+ @GetMapping(value = "/memberCoinAddressInList")
+ public Result memberCoinAddressInList() {
+ return memberService.memberCoinAddressInList();
+ }
+
+ /**
+ * 添加内转提币地址
+ * @return
+ */
+ @ApiOperation(value = "添加内转提币地址", notes = "添加内转提币地址")
+ @PostMapping(value = "/memberAddCoinAddressIn")
+ public Result memberAddCoinAddressIn(@RequestBody @Valid MemberAddCoinAddressInDto memberAddCoinAddressDto) {
+ return memberService.memberAddCoinAddressIn(memberAddCoinAddressDto);
+ }
+
+ /**
+ * 提币申请--内转
+ * @return
+ */
+ @ApiOperation(value="提交提币申请--内转", notes="提交提币申请--内转")
+ @PostMapping(value="/memberSubmitCoinApplyIn")
+ public Result memberSubmitCoinApplyIn(@RequestBody @Valid MemberSubmitCoinApplyInDto memberSubmitCoinApplyInDto) {
+ return memberService.memberSubmitCoinApplyIn(memberSubmitCoinApplyInDto);
+ }
+
+ /**
+ * 删除内转提币地址
+ * @return
+ */
+ @ApiOperation(value="删除内转提币地址", notes="删除内转提币地址")
+ @PostMapping(value="/memberDelCoinAddressIn")
+ public Result memberDelCoinAddressIn(@RequestBody @Valid MemberDelCoinAddressDto memberDelCoinAddressDto) {
+ return memberService.memberDelCoinAddressIn(memberDelCoinAddressDto);
+ }
+
+
}
--
Gitblit v1.9.1