Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

Helius

2021-03-26 19a0ffbf9653be38d3f366fc25cda8357e534086

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

@@ -97,13 +97,17 @@
                if (ids.size() == 1) {
                    ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectById(ids.get(0));

                    // 判断仓位类型是否逐仓
                    if (holdOrderEntity.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
                        // 逐仓平仓
                        cancelHoldOrderMethod(holdOrderEntity);
                    if (holdOrderEntity != null) {
                        // 判断仓位类型是否逐仓
                        if (holdOrderEntity.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
                            // 逐仓平仓
                            cancelHoldOrderMethod(holdOrderEntity);
                        } else {
                            // 全仓模式平仓
                            closingWholeOrder(holdOrderEntity);
                        }
                    } else {
                        // 全仓模式平仓
                        closingWholeOrder(holdOrderEntity);
                        log.info("持仓订单为空: {}", ids.get(0));
                    }
                } else {
                    List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectBatchIds(ids);
@@ -215,7 +219,7 @@
                    followOrderOperationService.closingFollowOrders(holdOrderEntity.getOrderNo());
                } else {
                    followFollowerProfitDao.updateFollowerProfitByTradeMemberId(holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()), profitOrLoss, traderInfoEntity.getMemberId(), memberEntity.getId());
                    LogRecordUtils.insertFollowerNotice(memberEntity.getId(), NoticeConstant.CLOSE_ORDER_TITLE, StrUtil.format(NoticeConstant.CLOSE_ORDER_CONTENT, contractOrderEntity.getSymbol(), contractOrderEntity.getClosingPrice(), profitOrLoss.setScale(8, BigDecimal.ROUND_DOWN).toString(), traderInfoEntity.getNickname()));
                    LogRecordUtils.insertFollowerNotice(memberEntity.getId(), NoticeConstant.CLOSE_ORDER_TITLE, StrUtil.format(NoticeConstant.CLOSE_ORDER_CONTENT, contractOrderEntity.getSymbol(), contractOrderEntity.getClosingPrice().setScale(2, BigDecimal.ROUND_HALF_UP).toString(), profitOrLoss.setScale(2, BigDecimal.ROUND_HALF_UP).toString(), traderInfoEntity.getNickname()));
                }
            }
        }
@@ -447,11 +451,13 @@
        contractOrderEntity.setEntrustOpeningPrice(newPrice);
        contractOrderEntity.setEntrustTime(new Date());
        contractOrderEntity.setClosingPrice(newPrice);
        contractOrderEntity.setTradeType(ContractOrderEntity.TRADE_TYPE_LIMIT_PRICE);
        contractOrderEntity.setOrderType(entrustOrder.getEntrustType());
        contractOrderEntity.setClosingType(closingType);
        contractOrderEntity.setSymbolCnt(closeCnt);
        contractOrderEntity.setRewardAmount(profitOrLoss);
        contractOrderEntity.setBondAmount(bondAmount);
        contractOrderEntity.setClosingTime(new Date());
        contractOrderEntity.setClosingFeeAmount(fee);
        contractOrderDao.insert(contractOrderEntity);