From 17b12b82967c65d170b7bda3c79e3aa76ecfa746 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 28 Aug 2020 14:48:59 +0800
Subject: [PATCH] Merge branch 'whole' of https://gitee.com/chonggaoxiao/new_excoin into whole

---
 src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 46 insertions(+), 0 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 c2a3f6e..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;
@@ -282,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
      */
@@ -289,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);
     }
     
     /**
@@ -300,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);
+    }
     
     /**
      * 获取发送验证码途径
@@ -362,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