modify

Helius

2020-06-05 bbe70f0e54f4a8873166684834d7794eb21483d4

modify

 src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java

@@ -27,11 +27,10 @@
     */
    public static final int TRADE_TYPE_LIMIT_PRICE = 2;


    /**
     * 订单类型 撤单
     * 订单状态 撤单
     */
    public static final int ORDER_TYPE_CANCEL = -1;
    public static final int ORDER_STATUS_CANCEL = 2;

    /**
     * 订单类型 开多
@@ -75,11 +74,16 @@
    private int tradeType;

    /**
     * 订单类型 - 0撤单,1开多,2开空,3平多,4平空
     * 订单类型 - 1开多,2开空,3平多,4平空
     */
    private int orderType;

    /**
     * 订单状态 - 1成交 2撤单
     */
    private int orderStatus;

    /**
     * 委托开仓价
     */
    private BigDecimal entrustOpeningPrice;

 src/main/java/com/xcong/excoin/modules/contract/mapper/ContractEntrustOrderEntityMapper.java

@@ -24,6 +24,7 @@
    @Mapping(source = "entrustPrice", target = "entrustOpeningPrice")
    @Mapping(source = "createTime", target = "entrustTime")
    @Mapping(source = "entrustAmount", target = "prePaymentAmount")
    @Mapping(source = "entrustType", target = "orderType")
    public abstract ContractOrderEntity entrustOrderToOrder(ContractEntrustOrderEntity orderEntity);

    @Mapping(source = "createTime", target = "entrustTime")

 src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java

@@ -19,9 +19,12 @@
    @ApiModelProperty("订单ID")
    private Long id;

    @ApiModelProperty("订单类型 -1撤单,1开多,2开空,3平多,4平空")
    @ApiModelProperty("订单类型 1开多,2开空,3平多,4平空")
    private int orderType;

    @ApiModelProperty("订单状态 1成交 2撤单")
    private int orderStatus;

    @ApiModelProperty("开仓均价")
    private BigDecimal openingPrice;


 src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java

@@ -172,7 +172,7 @@

        ContractOrderEntity orderEntity = ContractEntrustOrderEntityMapper.INSTANCE.entrustOrderToOrder(entrustOrderEntity);
        orderEntity.setTradeType(ContractOrderEntity.TRADE_TYPE_MARK_PRICE);
        orderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CANCEL);
        orderEntity.setOrderStatus(ContractOrderEntity.ORDER_STATUS_CANCEL);
        int i = contractOrderDao.insert(orderEntity);

        contractEntrustOrderDao.deleteById(entrustOrderEntity.getId());