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

Helius

2020-08-14 8de9b17d1070f3e0cd2094e0385035fe0c1ef535

 src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java

@@ -22,9 +22,11 @@

    public void updateOrderIsCanClosingAndBatchNoById(Long id);

    public Result findHoldOrderList(String symbol);
    public Result findHoldOrderList(String symbol, int type);

    public Result cancelHoldOrder(Long id);

    public Result cancelHoldOrder(WholeCloseOrderDto wholeCloseOrderDto);

    public Result cancelHoldOrderBatch(SymbolDto symbolDto);

@@ -42,4 +44,8 @@

    public Result findOrderDetailById(Long id);

    public void calHoldOrderHoldFeeAmount();

    public Result changePositionType();

}