优化usdt同步

zainali5120

2020-10-09 f0de669a7d37d15f841952e41834ecca07aa1fc5

 src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java

@@ -5,6 +5,10 @@
import javax.annotation.Resource;

import javax.validation.Valid;



import com.alibaba.fastjson.JSONObject;

import com.xcong.excoin.modules.coin.entity.OrderCoinsEntity;

import com.xcong.excoin.modules.symbols.constants.SymbolsConstats;

import org.springframework.validation.annotation.Validated;

import org.springframework.web.bind.annotation.GetMapping;

import org.springframework.web.bind.annotation.PostMapping;

import org.springframework.web.bind.annotation.RequestBody;

@@ -13,12 +17,13 @@


import com.xcong.excoin.common.response.Result;

import com.xcong.excoin.modules.coin.parameter.dto.CancelEntrustWalletCoinOrderDto;

import com.xcong.excoin.modules.coin.parameter.dto.FindAllWalletCoinOrderDto;

import com.xcong.excoin.modules.coin.parameter.dto.FindCollectDto;

import com.xcong.excoin.modules.coin.parameter.dto.SubmitSalesWalletCoinOrderDto;

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

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

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

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

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

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

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

import com.xcong.excoin.modules.coin.service.OrderCoinService;



@@ -26,7 +31,6 @@
import io.swagger.annotations.ApiImplicitParam;

import io.swagger.annotations.ApiImplicitParams;

import io.swagger.annotations.ApiOperation;

import io.swagger.annotations.ApiParam;

import io.swagger.annotations.ApiResponse;

import io.swagger.annotations.ApiResponses;

import lombok.extern.slf4j.Slf4j;

@@ -47,12 +51,11 @@
   @ApiOperation(value = "进入交易页面", notes = "进入交易页面")

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

   @ApiImplicitParams({

      @ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query"),

      @ApiImplicitParam(name = "type", value = "买入卖出类型1：买入，2：卖出", required = true, dataType = "String", paramType="query")

      @ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query")

   })

    @GetMapping(value = "/enterTransactionPageOfWalletCoin")

   public Result enterTransactionPageOfWalletCoin(String symbol,String type) {

      return orderCoinService.enterTransactionPageOfWalletCoin(symbol,type);

   public Result enterTransactionPageOfWalletCoin(String symbol) {

      return orderCoinService.enterTransactionPageOfWalletCoin(symbol);

   }

   

   /**

@@ -62,12 +65,18 @@
   @ApiOperation(value = "提交买卖订单", notes = "提交买卖订单")

   @PostMapping(value="/submitSalesWalletCoinOrder")

   public Result submitSalesWalletCoinOrder(@RequestBody @Valid SubmitSalesWalletCoinOrderDto submitSalesWalletCoinOrderDto) {

      log.info("买卖单参数[{}]", JSONObject.toJSONString(submitSalesWalletCoinOrderDto));

      String symbol = submitSalesWalletCoinOrderDto.getSymbol();

      Integer type = submitSalesWalletCoinOrderDto.getType();

      Integer tradeType = submitSalesWalletCoinOrderDto.getTradeType();

      BigDecimal price = submitSalesWalletCoinOrderDto.getPrice();

      BigDecimal amount = submitSalesWalletCoinOrderDto.getAmount();

      return orderCoinService.submitSalesWalletCoinOrder(symbol,type,tradeType,price,amount);

      if(SymbolsConstats.EXCHANGE_SYMBOLS.contains(symbol)){

         return orderCoinService.submitSalesWalletCoinOrderWithMatch(symbol,type,tradeType,price,amount,submitSalesWalletCoinOrderDto.getEntrustAmount());



      }else{

         return orderCoinService.submitSalesWalletCoinOrder(symbol,type,tradeType,price,amount,submitSalesWalletCoinOrderDto.getEntrustAmount());

      }

   }

   

   /**

@@ -75,7 +84,7 @@
    * @return

    */

   @ApiOperation(value = "获取委托单数据", notes = "获取委托单数据")

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

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

   @ApiImplicitParams({

      @ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query"),

      @ApiImplicitParam(name = "status", value = "状态 1：委托中2：撤单3：已成交", required = true, dataType = "int", paramType="query")

@@ -92,8 +101,9 @@
   @ApiOperation(value = "撤销委托订单", notes = "撤销委托订单")

   @PostMapping(value="/cancelEntrustWalletCoinOrder")

   public Result cancelEntrustWalletCoinOrder(@RequestBody @Valid CancelEntrustWalletCoinOrderDto cancelEntrustWalletCoinOrderDto) {

      String orderNo = cancelEntrustWalletCoinOrderDto.getOrderNo();

      return orderCoinService.cancelEntrustWalletCoinOrder(orderNo);

      String orderId = cancelEntrustWalletCoinOrderDto.getOrderId();

      // 根据不同币种

      return orderCoinService.cancelEntrustWalletCoinOrder(orderId);

   }

   

   /**

@@ -101,10 +111,10 @@
    * @return

    */

   @ApiOperation(value = "获取币币交易历史订单信息", notes = "获取币币交易历史订单信息")

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

    @GetMapping(value = "/findAllWalletCoinOrder")

   public Result  findAllWalletCoinOrder() {

      return orderCoinService.findAllWalletCoinOrder();

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

   @PostMapping(value="/findAllWalletCoinOrder")

   public Result  findAllWalletCoinOrder(@RequestBody @Validated FindAllWalletCoinOrderDto findAllWalletCoinOrderDto) {

      return orderCoinService.findAllWalletCoinOrder(findAllWalletCoinOrderDto);

   }

   

   /**

@@ -147,4 +157,25 @@
      return orderCoinService.checkIsCollect(symbol);

   }

   

   /**

    * 已自选的币种

    * @return

    */

   @ApiOperation(value = "已自选的币种", notes = "已自选的币种")

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

    @GetMapping(value = "/findCollectList")

   public Result  findCollectList() {

      return orderCoinService.findCollectList();

   }

	
   /**

    * 币种搜索

    * @return

    */

   @ApiOperation(value = "币种搜索", notes = "币种搜索")

    @GetMapping(value = "/searchSymbolResultList")

   public Result  searchSymbolResultList() {

      return orderCoinService.searchSymbolResultList();

   }



}