From dfc346ba83320be85e67156ea420c68d937c47ee Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 04 Sep 2020 14:47:34 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 13 +++++++++++++ src/main/java/com/xcong/excoin/modules/contract/service/RabbitOrderService.java | 4 ++++ src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 2 ++ 3 files changed, 19 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/RabbitOrderService.java b/src/main/java/com/xcong/excoin/modules/contract/service/RabbitOrderService.java index b934cb1..47eeb06 100644 --- a/src/main/java/com/xcong/excoin/modules/contract/service/RabbitOrderService.java +++ b/src/main/java/com/xcong/excoin/modules/contract/service/RabbitOrderService.java @@ -1,6 +1,7 @@ package com.xcong.excoin.modules.contract.service; +import com.xcong.excoin.modules.member.entity.MemberEntity; import com.xcong.excoin.rabbit.pricequeue.OrderModel; import java.util.List; @@ -13,4 +14,7 @@ public void cancelHoldOrder(List<Long> ids); public void entrustCloseOrder(List<OrderModel> list); + + + public void wholeBombOrder(MemberEntity memberEntity); } 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 4e4e080..4a100fa 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 @@ -467,4 +467,17 @@ // 计算佣金 ThreadPoolUtils.calReturnMoney(memberEntity.getId(), fee, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE); } + + + @Override + public void wholeBombOrder(MemberEntity memberEntity) { + Long memberId = memberEntity.getId(); + List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListForWholeByMemberIdAndSymbol(memberId, null); + + if (CollUtil.isNotEmpty(holdOrderEntities)) { + + } else { + log.info("无当前持仓"); + } + } } diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java index 35f8d7d..ad945ca 100644 --- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java +++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java @@ -15,6 +15,7 @@ import com.xcong.excoin.common.system.service.CommonService; import com.xcong.excoin.modules.coin.dao.MemberAccountMoneyChangeDao; import com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange; +import com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity; import com.xcong.excoin.modules.member.dao.*; import com.xcong.excoin.modules.member.entity.*; import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressDto; @@ -161,6 +162,7 @@ member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_UN_SUBMIT); member.setIsForce(1); member.setIsProfit(0); + member.setContractPositionType(ContractEntrustOrderEntity.POSITION_TYPE_ALL); memberDao.insert(member); MemberSettingEntity memberSettingEntity = new MemberSettingEntity(); -- Gitblit v1.9.1