zainali5120
2020-09-16 d174d6963d62b3bd176f9e7ba3cf0d7f75a91b69
src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java
@@ -5,6 +5,8 @@
import javax.annotation.Resource;
import javax.validation.Valid;
import com.xcong.excoin.modules.coin.entity.OrderCoinsEntity;
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,11 +15,11 @@
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.OrderWalletCoinListVo;
import com.xcong.excoin.modules.coin.parameter.vo.TransactionPageOfWalletCoinVo;
@@ -27,7 +29,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;
@@ -67,7 +68,12 @@
      Integer tradeType = submitSalesWalletCoinOrderDto.getTradeType();
      BigDecimal price = submitSalesWalletCoinOrderDto.getPrice();
      BigDecimal amount = submitSalesWalletCoinOrderDto.getAmount();
      return orderCoinService.submitSalesWalletCoinOrder(symbol,type,tradeType,price,amount);
      if("NEKK".equals(symbol)){
         return orderCoinService.submitSalesWalletCoinOrderWithMatch(symbol,type,tradeType,price,amount,submitSalesWalletCoinOrderDto.getEntrustAmount());
      }else{
         return orderCoinService.submitSalesWalletCoinOrder(symbol,type,tradeType,price,amount,submitSalesWalletCoinOrderDto.getEntrustAmount());
      }
   }
   
   /**
@@ -101,10 +107,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);
   }
   
   /**
@@ -158,4 +164,14 @@
      return orderCoinService.findCollectList();
   }
   
   /**
    * 币种搜索
    * @return
    */
   @ApiOperation(value = "币种搜索", notes = "币种搜索")
    @GetMapping(value = "/searchSymbolResultList")
   public Result  searchSymbolResultList() {
      return orderCoinService.searchSymbolResultList();
   }
}