modify

Helius

2020-08-19 1c4cd7d4de706f6ee6d3bd435b084ea89999bf71

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

@@ -89,15 +89,11 @@
    @Transactional(rollbackFor = Exception.class)
    @Override
    public void cancelHoldOrder(List<Long> ids) {
        log.info("--------");
        if (CollUtil.isNotEmpty(ids)) {
            try {
                log.info("=========:{}", ids.size());
                if (ids.size() == 1) {
                    log.info("------->>>>>>:{}", ids.get(0));
                    ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectById(ids.get(0));

                    log.info(">>>>>>>>>>>>>{}", holdOrderEntity);
                    // 判断仓位类型是否逐仓
                    if (holdOrderEntity.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
                        // 逐仓平仓
@@ -259,7 +255,6 @@
     * 全仓模式平仓逻辑
     */
    public void closingWholeOrder(ContractHoldOrderEntity holdOrderEntity) {
        log.info("进入全仓模式--平仓");
        String symbol = holdOrderEntity.getSymbol();
        // 获取最新价
        BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(symbol)));
@@ -268,7 +263,6 @@

        MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(holdOrderEntity.getMemberId(), CoinTypeEnum.USDT.name());
        if (walletContract != null) {
            log.info("--->逻辑");
            BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(symbol);
            // 盈亏
            BigDecimal profitOrLoss = BigDecimal.ZERO;
@@ -332,9 +326,9 @@

            BigDecimal changeAmount = profitOrLoss.add(bondAmount).subtract(fee);

            memberWalletContractDao.increaseWalletContractBalanceById(changeAmount, fee.negate(), null, walletContract.getId());
            memberWalletContractDao.increaseWalletContractBalanceById(changeAmount, profitOrLoss.subtract(fee), null, walletContract.getId());

            ThreadPoolUtils.sendWholeForceClosingPrice(holdOrderEntity.getSymbol(), memberEntity);
//            ThreadPoolUtils.sendWholeForceClosingPrice(holdOrderEntity.getSymbol(), memberEntity);
            // 计算佣金
            ThreadPoolUtils.calReturnMoney(memberEntity.getId(), fee, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);