From 6cdfe1d568d06bc63bb513ce0ef1df6aac3c7c3d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 20 Feb 2021 15:32:12 +0800
Subject: [PATCH] fix

---
 src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java |   44 ++++++++++++++++++++++++++++----------------
 1 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java b/src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java
index e6e5d33..64df9f2 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java
@@ -5,7 +5,8 @@
 import javax.annotation.Resource;
 import javax.validation.Valid;
 
-import com.xcong.excoin.modules.coin.parameter.vo.MemberAccountMoneyChangeVo;
+import com.xcong.excoin.modules.coin.parameter.vo.AllWalletCoinVo;
+import com.xcong.excoin.modules.coin.parameter.vo.MemberAccountMoneyChangeInfoVo;
 import com.xcong.excoin.modules.coin.parameter.vo.MemberAgentIntoInfoVo;
 import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletAgentInfoVo;
 import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletCoinInfoVo;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import com.xcong.excoin.common.response.Result;
+import com.xcong.excoin.modules.coin.parameter.dto.RecordsPageDto;
 import com.xcong.excoin.modules.coin.parameter.dto.TransferOfBalanceDto;
 import com.xcong.excoin.modules.coin.parameter.dto.TransferOfBalanceFromAgentDto;
 import com.xcong.excoin.modules.coin.service.CoinService;
@@ -35,6 +37,16 @@
 	@Resource
 	private CoinService coinService;
 	
+	/**
+	 *  获取我的总资产
+	 * @return
+	 */
+	@ApiOperation(value = "获取我的总资产", notes = "获取我的总资产")
+	@ApiResponses({@ApiResponse( code = 200, message = "success", response = AllWalletCoinVo.class)})
+	@GetMapping(value = "/getAllWalletCoin")
+	public Result getAllWalletCoin() {
+		return coinService.getAllWalletCoin();
+	}
 	/**
 	 *  获取我的币币资产信息
 	 * @return
@@ -111,10 +123,10 @@
 	 * @return
 	 */
 	@ApiOperation(value="获取币币资产交易记录", notes="获取币币资产交易记录")
-	@ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeVo.class)})
-	@GetMapping(value="/getWalletCoinRecords")
-	public Result  getWalletCoinRecords() {
-		return coinService.getWalletCoinRecords();
+	@ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeInfoVo.class)})
+	@PostMapping(value="/getWalletCoinRecords")
+	public Result  getWalletCoinRecords(@RequestBody @Valid RecordsPageDto recordsPageDto) {
+		return coinService.getWalletCoinRecords(recordsPageDto);
 	}
 	
 	/**
@@ -122,10 +134,10 @@
 	 * @return
 	 */
 	@ApiOperation(value="获取合约资产交易记录", notes="获取合约资产交易记录")
-	@ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeVo.class)})
-	@GetMapping(value="/getWalletContractRecords")
-	public Result getWalletContractRecords() {
-		return coinService.getWalletContractRecords();
+	@ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeInfoVo.class)})
+	@PostMapping(value="/getWalletContractRecords")
+	public Result getWalletContractRecords(@RequestBody @Valid RecordsPageDto recordsPageDto) {
+		return coinService.getWalletContractRecords(recordsPageDto);
 	}
 	
 	/**
@@ -133,10 +145,10 @@
 	 * @return
 	 */
 	@ApiOperation(value="获取代理资产交易记录", notes="获取代理资产交易记录")
-	@ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeVo.class)})
-	@GetMapping(value="/getWalletAgentRecords")
-	public Result  getWalletAgentRecords() {
-		return coinService.getWalletAgentRecords();
+	@ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeInfoVo.class)})
+	@PostMapping(value="/getWalletAgentRecords")
+	public Result  getWalletAgentRecords(@RequestBody @Valid RecordsPageDto recordsPageDto) {
+		return coinService.getWalletAgentRecords(recordsPageDto);
 	}
 	
 	/**
@@ -145,9 +157,9 @@
 	 */
 	@ApiOperation(value="获取代理资产佣金入账", notes="获取代理资产佣金入账")
 	@ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAgentIntoInfoVo.class)})
-	@GetMapping(value="/getWalletAgentIntoRecords")
-	public Result  getWalletAgentIntoRecords() {
-		return coinService.getWalletAgentIntoRecords();
+	@PostMapping(value="/getWalletAgentIntoRecords")
+	public Result  getWalletAgentIntoRecords(@RequestBody @Valid RecordsPageDto recordsPageDto) {
+		return coinService.getWalletAgentIntoRecords(recordsPageDto);
 	}
 	
 	/**

--
Gitblit v1.9.1