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

Helius

2020-07-07 ce4fb58f85eefe9fe6bb6213d8f1576d1925a5ef

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

@@ -3,9 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;
import com.xcong.excoin.modules.contract.parameter.dto.ChangeBondDto;
import com.xcong.excoin.modules.contract.parameter.dto.ProfitOrLessDto;
import com.xcong.excoin.modules.contract.parameter.dto.SubmitOrderDto;
import com.xcong.excoin.modules.contract.parameter.dto.*;
import com.xcong.excoin.rabbit.pricequeue.OrderModel;
import org.apache.ibatis.annotations.Param;

@@ -24,11 +22,11 @@

    public void updateOrderIsCanClosingAndBatchNoById(Long id);

    public Result findHoldOrderList();
    public Result findHoldOrderList(String symbol);

    public Result cancelHoldOrder(Long id);

    public Result cancelHoldOrderBatch();
    public Result cancelHoldOrderBatch(SymbolDto symbolDto);

    public Result setTargetProfitOrLess(ProfitOrLessDto profitOrLessDto);

@@ -36,4 +34,14 @@

    public Result findContractMoneyInfo(String symbol);

    public Result changeLeverRate(ChangeLeverRateDto changeLeverRateDto);

    public Result findHoldOrderDetailById(Long id);

    public Result findOrderList(OrderListDto orderListDto);

    public Result findOrderDetailById(Long id);

    public void calHoldOrderHoldFeeAmount();

}