Merge remote-tracking branch 'origin/whole_new' into whole_new

zainali5120

2021-02-25 9219e18a9b2fb06b95b5c881b057d3fde7270ca3

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

@@ -40,4 +42,11 @@

    public Result findOrderList(OrderListDto orderListDto);

    public Result findOrderDetailById(Long id);

    public void calHoldOrderHoldFeeAmount();

    public Result changePositionType();
    public void calHoldFeeAmountForBondAmount();

}