Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin

Helius

2020-07-07 ce4fb58f85eefe9fe6bb6213d8f1576d1925a5ef

 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.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;

import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletCoinVo;

@@ -19,6 +20,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;

@@ -110,10 +112,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);

   }

   

   /**

@@ -121,10 +123,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);

   }

   

   /**

@@ -132,10 +134,21 @@
    * @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);

   }

	
   /**

    *  获取代理资产佣金入账

    * @return

    */

   @ApiOperation(value="获取代理资产佣金入账", notes="获取代理资产佣金入账")

   @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAgentIntoInfoVo.class)})

   @GetMapping(value="/getWalletAgentIntoRecords")

   public Result  getWalletAgentIntoRecords() {

      return coinService.getWalletAgentIntoRecords();

   }

   

   /**