modify

Helius

2021-03-31 e355907d36b87abb14985e4fb294ccb612f7307e

modify

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

@@ -536,7 +536,7 @@
                    continue;
                }

//                holdOrderEntity.setForceClosingPrice(getForceSetPrice(wholePriceData, holdOrderEntity, holdOrderDataModel.getSymbol()));
                holdOrderEntity.setStopProfitPrice(CalculateUtil.calForcePriceForWhole(memberEntity, holdOrderEntity));
                contractHoldOrderDao.deleteById(holdOrderDataModel.getId());

                ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);
@@ -552,7 +552,6 @@
                contractOrderEntity.setRewardAmount(holdOrderDataModel.getRewardAmount().add(contractOrderEntity.getHoldBond().negate()));
                contractOrderEntity.setClosingPrice(holdOrderDataModel.getClosingPrice());
                contractOrderEntity.setForceClosingPrice(holdOrderDataModel.getClosingPrice());
                contractOrderEntity.setStopProfitPrice(CalculateUtil.calForcePriceForWhole(memberEntity, holdOrderEntity));

                // 订单状态转换
                if (ContractOrderEntity.ORDER_TYPE_OPEN_MORE == contractOrderEntity.getOrderType()) {

 src/main/java/com/xcong/excoin/utils/CalculateUtil.java

@@ -163,6 +163,13 @@
        return result;

    }



    /**

     * 开仓价 +/- (权益 - 其他币种成本 - 当前币种维持保证金)/(规格*张数)

     *

     * @param memberEntity

     * @param contractHoldOrderEntity

     * @return

     */

    public static BigDecimal calForcePriceForWhole(MemberEntity memberEntity, ContractHoldOrderEntity contractHoldOrderEntity) {

        ContractHoldOrderDao holdOrderDao = SpringContextHolder.getBean(ContractHoldOrderDao.class);

        MemberWalletContractDao walletContractDao = SpringContextHolder.getBean(MemberWalletContractDao.class);