From 05c74ca131add20dbcf23dc109e63c21b3e2be29 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 24 Feb 2021 18:11:57 +0800
Subject: [PATCH] Merge branch 'whole_new_trc20' into whole_new
---
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 2 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..4375126 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,6 +11,7 @@
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressDto;
+import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressInDto;
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;
@@ -19,6 +20,7 @@
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.MemberSubmitCoinApplyInDto;
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;
@@ -26,6 +28,7 @@
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.MemberCoinAddressInListVo;
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;
@@ -61,13 +64,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 +285,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 +303,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 +324,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);
+ }
/**
* 获取发送验证码途径
@@ -350,4 +396,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