From b213bda26a73e098880939ed36911cf25693e9d6 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 04 Sep 2020 15:00:04 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java index 4a100fa..a3462b1 100644 --- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java +++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java @@ -318,7 +318,7 @@ contractOrderEntity.setClosingType(closingType); contractOrderEntity.setSymbolCnt(closeCnt); contractOrderEntity.setRewardAmount(profitOrLoss); - contractOrderEntity.setBondAmount(bondAmount); + contractOrderEntity.setBondAmount(bondAmount.add(fee)); contractOrderEntity.setClosingFeeAmount(fee); contractOrderDao.insert(contractOrderEntity); @@ -470,14 +470,22 @@ @Override - public void wholeBombOrder(MemberEntity memberEntity) { - Long memberId = memberEntity.getId(); - List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListForWholeByMemberIdAndSymbol(memberId, null); + public void wholeBombOrder(List<OrderModel> list) { - if (CollUtil.isNotEmpty(holdOrderEntities)) { + for (OrderModel orderModel : list) { + MemberEntity memberEntity = memberDao.selectById(orderModel.getMemberId()); + Long memberId = memberEntity.getId(); + List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListForWholeByMemberIdAndSymbol(memberId, null); - } else { - log.info("无当前持仓"); + BigDecimal currentPrice = new BigDecimal(orderModel.getPrice()); + if (CollUtil.isNotEmpty(holdOrderEntities)) { + + for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) { + + } + } else { + log.info("无当前持仓"); + } } } } -- Gitblit v1.9.1