modify

Helius

2020-08-26 b8d99345019d2326c84659343d89f3d563ad0b91

modify

 src/main/java/com/xcong/excoin/modules/contract/dao/ContractHoldOrderDao.java

@@ -47,7 +47,7 @@

    public List<ContractHoldOrderEntity> selectMemberHoldOrderByPositionType(@Param("positionType") Integer positionType, @Param("memberId") Long memberId);

    public ContractHoldOrderEntity selectWholeHoldOrderByOrderType(@Param("memberId") Long memberId, @Param("orderType") Integer orderType);
    public ContractHoldOrderEntity selectWholeHoldOrderByOrderType(@Param("memberId") Long memberId, @Param("orderType") Integer orderType, @Param("symbol") String symbol);

    public List<ContractHoldOrderEntity> selectHoldOrderListForWholeByMemberIdAndSymbol(@Param("memberId") Long memberId, @Param("symbol") String symbol);


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

@@ -180,7 +180,7 @@

        MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeConvert.convertContractTypeToCoin(submitEntrustDto.getSymbol()));

        ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectWholeHoldOrderByOrderType(memberEntity.getId(), submitEntrustDto.getEntrustType());
        ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectWholeHoldOrderByOrderType(memberEntity.getId(), submitEntrustDto.getEntrustType(), submitEntrustDto.getSymbol());

        BigDecimal bondAmount;
        BigDecimal openFeePrice;

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

@@ -146,7 +146,7 @@
        BigDecimal openFeePrice = CalculateUtil.getOpenFeePrice(openingPrice, lotNumber, submitOrderDto.getSymbolCnt(), tradeSettingEntity.getFeeRatio());
        log.info("开仓手续费:{}", openFeePrice);

        ContractHoldOrderEntity wholeHoldOrder = contractHoldOrderDao.selectWholeHoldOrderByOrderType(memberEntity.getId(), submitOrderDto.getOrderType());
        ContractHoldOrderEntity wholeHoldOrder = contractHoldOrderDao.selectWholeHoldOrderByOrderType(memberEntity.getId(), submitOrderDto.getOrderType(), submitOrderDto.getSymbol());
        // 判断当前是否存在全仓订单，若存在则直接合并，若不存在则创建订单
        if (wholeHoldOrder != null) {
            BigDecimal totalPrice = openingPrice.multiply(BigDecimal.valueOf(submitOrderDto.getSymbolCnt()));

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

@@ -614,7 +614,7 @@
        // 手续费
        BigDecimal openFeePrice = CalculateUtil.getOpenFeePrice(entrustOrder.getEntrustPrice(), entrustOrder.getSymbolSku(), entrustOrder.getSymbolCnt(), tradeSettingEntity.getFeeRatio());

        ContractHoldOrderEntity wholeHoldOrder = contractHoldOrderDao.selectWholeHoldOrderByOrderType(entrustOrder.getMemberId(), entrustOrder.getEntrustType());
        ContractHoldOrderEntity wholeHoldOrder = contractHoldOrderDao.selectWholeHoldOrderByOrderType(entrustOrder.getMemberId(), entrustOrder.getEntrustType(), entrustOrder.getSymbol());
        // 判断持仓是否存在，若不存在则创建新的持仓订单
        if (wholeHoldOrder == null) {
            log.info("持仓不存在");

 src/main/resources/mapper/contract/ContractHoldOrderDao.xml

@@ -56,7 +56,7 @@

    <select id="selectWholeHoldOrderByOrderType" resultType="com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity">
        select * from contract_hold_order
        where member_id=#{memberId} and opening_type=#{orderType}
        where member_id=#{memberId} and opening_type=#{orderType} and symbol=#{symbol}
    </select>

    <select id="selectHoldOrderListForWholeByMemberIdAndSymbol" resultType="com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity">