modify

Helius

2021-03-30 ecef817ae72967e5ffd935d730871ad049db679a

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

@@ -113,7 +113,14 @@
                    List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectBatchIds(ids);
                    if (CollUtil.isNotEmpty(holdOrderEntities)) {
                        for (ContractHoldOrderEntity holdOrder : holdOrderEntities) {
                            cancelHoldOrderMethod(holdOrder);
                            // 判断仓位类型是否逐仓
                            if (holdOrder.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
                                // 逐仓平仓
                                cancelHoldOrderMethod(holdOrder);
                            } else {
                                // 全仓模式平仓
                                closingWholeOrder(holdOrder);
                            }
                        }
                    }
                }
@@ -226,7 +233,7 @@
                if (MemberEntity.IS_TRADER_Y.equals(memberEntity.getIsTrader())) {
                    followOrderOperationService.closingFollowOrders(holdOrderEntity.getOrderNo());
                } else {
                    followFollowerProfitDao.updateFollowerProfitByTradeMemberId(holdOrderEntity.getBondAmount(), profitOrLoss, traderInfoEntity.getMemberId(), memberEntity.getId());
                    //followFollowerProfitDao.updateFollowerProfitByTradeMemberId(holdOrderEntity.getBondAmount(), profitOrLoss, traderInfoEntity.getMemberId(), memberEntity.getId());
                    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()));
                }
            }
@@ -286,6 +293,11 @@

            // 获取平仓张数
            Integer closeCnt = (Integer) redisUtils.get(AppContants.CLOSING_ORDER_PREFIX + holdOrderEntity.getId());
            // 无法从redis中获取平仓张数，说明来自一键平仓
            if (closeCnt == null) {
                closeCnt = holdOrderEntity.getSymbolCntSale();
                holdOrderEntity.setSymbolCntSale(0);
            }

            MemberSettingEntity memberSettingEntity = memberSettingDao.selectMemberSettingByMemberId(memberEntity.getId());
            // 开多