From 18aab7d6156b93d65c1b18809d924cbb214d737a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Feb 2021 16:04:03 +0800
Subject: [PATCH] Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole_new
---
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 105 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 79 insertions(+), 26 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..0ae5d27 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,6 +3,8 @@
import javax.annotation.Resource;
import javax.validation.Valid;
+import com.xcong.excoin.modules.member.parameter.dto.*;
+import com.xcong.excoin.modules.member.parameter.vo.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -10,29 +12,6 @@
import org.springframework.web.bind.annotation.RestController;
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;
@@ -61,13 +40,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
@@ -270,6 +261,17 @@
}
/**
+ * 获取内转提币地址
+ * @return
+ */
+ @ApiOperation(value = "获取内转提币地址列表", notes = "获取内转提币地址列表")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberCoinAddressInListVo.class)})
+ @GetMapping(value = "/memberCoinAddressInList")
+ public Result memberCoinAddressInList() {
+ return memberService.memberCoinAddressInList();
+ }
+
+ /**
* 添加提币地址
* @return
*/
@@ -277,6 +279,16 @@
@PostMapping(value = "/memberAddCoinAddress")
public Result memberAddCoinAddress(@RequestBody @Valid MemberAddCoinAddressDto memberAddCoinAddressDto) {
return memberService.memberAddCoinAddress(memberAddCoinAddressDto);
+ }
+
+ /**
+ * 添加内转提币地址
+ * @return
+ */
+ @ApiOperation(value = "添加内转提币地址", notes = "添加内转提币地址")
+ @PostMapping(value = "/memberAddCoinAddressIn")
+ public Result memberAddCoinAddressIn(@RequestBody @Valid MemberAddCoinAddressInDto memberAddCoinAddressDto) {
+ return memberService.memberAddCoinAddressIn(memberAddCoinAddressDto);
}
/**
@@ -288,6 +300,16 @@
public Result memberDelCoinAddress(@RequestBody @Valid MemberDelCoinAddressDto memberDelCoinAddressDto) {
return memberService.memberDelCoinAddress(memberDelCoinAddressDto);
}
+
+ /**
+ * 删除内转提币地址
+ * @return
+ */
+ @ApiOperation(value="删除内转提币地址", notes="删除内转提币地址")
+ @PostMapping(value="/memberDelCoinAddressIn")
+ public Result memberDelCoinAddressIn(@RequestBody @Valid MemberDelCoinAddressDto memberDelCoinAddressDto) {
+ return memberService.memberDelCoinAddressIn(memberDelCoinAddressDto);
+ }
/**
* 获取发送验证码途径
@@ -310,7 +332,26 @@
public Result memberPersonCenterInfo() {
return memberService.memberPersonCenterInfo();
}
-
+
+ /**
+ * 指纹解锁功能保存
+ */
+ @ApiOperation(value="指纹解锁功能保存", notes="指纹解锁功能保存")
+ @PostMapping(value="/memberFingerprintState")
+ public Result memberFingerprintState(@RequestBody @Valid MemberFingerprintStateDto memberFingerprintStateDto) {
+ return memberService.memberFingerprintState(memberFingerprintStateDto);
+ }
+
+ /**
+ * 获取消息提醒的状态
+ */
+ @ApiOperation(value = "获取消息提醒的状态", notes = "获取消息提醒的状态")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberMessageReminderVo.class)})
+ @GetMapping(value = "/memberMessageReminder")
+ public Result memberMessageReminder() {
+ return memberService.memberMessageReminder();
+ }
+
/**
* 提币币种信息
* @return
@@ -350,4 +391,16 @@
return memberService.memberSubmitCoinApply(memberSubmitCoinApplyDto);
}
+ /**
+ * 提币申请--内转
+ * @param token
+ * @param coinVo
+ * @return
+ */
+ @ApiOperation(value="提交提币申请", notes="提交提币申请")
+ @PostMapping(value="/memberSubmitCoinApplyIn")
+ public Result memberSubmitCoinApplyIn(@RequestBody @Valid MemberSubmitCoinApplyInDto memberSubmitCoinApplyInDto) {
+ return memberService.memberSubmitCoinApplyIn(memberSubmitCoinApplyInDto);
+ }
+
}
--
Gitblit v1.9.1