fix

Helius

2021-11-04 c8c093f53adfb2f60947b7d27f102400cc1c07a7

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

@@ -5,12 +5,14 @@
import javax.annotation.Resource;

import javax.validation.Valid;



import com.alibaba.fastjson.JSONObject;

import com.xcong.excoin.common.annotations.SubmitRepeat;

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

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

import com.xcong.excoin.utils.RedisUtils;

import org.springframework.beans.factory.annotation.Autowired;

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;

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

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

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



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

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

@@ -36,11 +38,14 @@
@Api(value = "币币交易接口", tags = "币币交易接口")

@RestController

@RequestMapping(value = "/api/orderCoin")

@CrossOrigin("*")

public class OrderCoinController {

   

   @Resource

   OrderCoinService orderCoinService;

	


   @Autowired

   private RedisUtils redisUtils;

   /**

    * 进入交易页面

    * @return

@@ -61,13 +66,24 @@
    */

   @ApiOperation(value = "提交买卖订单", notes = "提交买卖订单")

   @PostMapping(value="/submitSalesWalletCoinOrder")

    @SubmitRepeat

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

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

      String status = redisUtils.getString("bea_start");

      if ("1".equals(status)) {

         return Result.fail("暂未开放");

      }

      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());

      }

   }

   

   /**

@@ -91,8 +107,10 @@
    */

   @ApiOperation(value = "撤销委托订单", notes = "撤销委托订单")

   @PostMapping(value="/cancelEntrustWalletCoinOrder")

    @SubmitRepeat

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

      String orderId = cancelEntrustWalletCoinOrderDto.getOrderId();

      // 根据不同币种

      return orderCoinService.cancelEntrustWalletCoinOrder(orderId);

   }

   

@@ -167,5 +185,15 @@
   public Result  searchSymbolResultList() {

      return orderCoinService.searchSymbolResultList();

   }

	


   /**

    * 获取币币交易历史订单信息

    * @return

    */

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

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

   @GetMapping(value="/deal/list")

   public Result  findAllWalletCoinOrder() {

      return orderCoinService.findAllWalletCoinOrder();

   }

}