From 4385b06801ad4c50bf4fc58bee992ef9de9fb260 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 27 May 2021 18:34:25 +0800
Subject: [PATCH] Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc

---
 src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java |   33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 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 ae3756a..3dc5424 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
@@ -5,11 +5,8 @@
 
 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;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.xcong.excoin.modules.member.vo.DefaultWayVo;
+import org.springframework.web.bind.annotation.*;
 
 import com.xcong.excoin.common.response.Result;
 import com.xcong.excoin.modules.member.service.MemberService;
@@ -36,7 +33,7 @@
 	
 	@Resource
 	MemberService memberService;
-	
+
 	/**
 	 *  获取当前版本号
 	 */
@@ -214,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();
+	}
 	
 	/**
      * 绑定手机号
@@ -352,8 +364,6 @@
 		return memberService.memberMessageReminder();
 	}
 
-	/**
-    
     /**
      * 提币币种信息
      * @return
@@ -374,11 +384,12 @@
     @ApiOperation(value = "提币币种可用资金", notes = "提币币种可用资金")
     @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAvivableCoinInfoVo.class)})
     @ApiImplicitParams({
-		@ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query")
+		@ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query"),
+		@ApiImplicitParam(name = "label", value = "label", required=false, dataType = "String", paramType="query")
 	})
     @GetMapping(value = "/memberAvivableCoinInfo")
-	public Result memberAvivableCoinInfo(String symbol) {
-		return memberService.memberAvivableCoinInfo(symbol);
+	public Result memberAvivableCoinInfo(String symbol,String label) {
+		return memberService.memberAvivableCoinInfo(symbol,label);
 	}
     
     /**

--
Gitblit v1.9.1