From 23f1c36f848cdbd431439c1fdde502d97d605cca Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 23 Mar 2021 19:11:41 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
index fefbb27..2f8519c 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
@@ -113,6 +113,14 @@
public Result submitOrder(SubmitOrderDto submitOrderDto) {
MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
+ //查询是否可以点击平仓按钮
+ Long memberIdLong = memberEntity.getId();
+ MemberEntity selectById = memberDao.selectById(memberIdLong);
+ Integer pcState = selectById.getPcState();
+ if(MemberEntity.PCSTATE_N == pcState) {
+ return Result.loading("loading_type");
+ }
+
// 判断当前对应的持仓/委托
if (memberEntity.getContractPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
List<ContractHoldOrderEntity> holdList = contractHoldOrderDao.selectMemberHoldOrderByPositionType(ContractEntrustOrderEntity.POSITION_TYPE_ALL, memberEntity.getId());
@@ -555,7 +563,7 @@
Long memberIdLong = memberEntity.getId();
MemberEntity selectById = memberDao.selectById(memberIdLong);
Integer pcState = selectById.getPcState();
- if(memberEntity.PCSTATE_N == pcState) {
+ if(MemberEntity.PCSTATE_N == pcState) {
return Result.loading("loading_type");
}
@@ -583,6 +591,13 @@
@Override
public Result cancelHoldOrder(WholeCloseOrderDto wholeCloseOrderDto) {
MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
+ //查询是否可以点击平仓按钮
+ Long memberIdLong = memberEntity.getId();
+ MemberEntity selectById = memberDao.selectById(memberIdLong);
+ Integer pcState = selectById.getPcState();
+ if(MemberEntity.PCSTATE_N == pcState) {
+ return Result.loading("loading_type");
+ }
ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectHoldOrderByMemberIdAndId(memberEntity.getId(), wholeCloseOrderDto.getId());
if (holdOrderEntity == null) {
// 订单不存在
@@ -629,7 +644,7 @@
Long memberIdLong = memberEntity.getId();
MemberEntity selectById = memberDao.selectById(memberIdLong);
Integer pcState = selectById.getPcState();
- if(memberEntity.PCSTATE_N == pcState) {
+ if(MemberEntity.PCSTATE_N == pcState) {
return Result.loading("loading_type");
}
@@ -654,7 +669,7 @@
Long memberIdLong = memberEntity.getId();
MemberEntity selectById = memberDao.selectById(memberIdLong);
Integer pcState = selectById.getPcState();
- if(memberEntity.PCSTATE_N == pcState) {
+ if(MemberEntity.PCSTATE_N == pcState) {
return Result.loading("loading_type");
}
@@ -763,6 +778,15 @@
@Override
public Result changeBond(ChangeBondDto changeBondDto) {
MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
+
+ //查询是否可以点击平仓按钮
+ Long memberIdLong = memberEntity.getId();
+ MemberEntity selectById = memberDao.selectById(memberIdLong);
+ Integer pcState = selectById.getPcState();
+ if(MemberEntity.PCSTATE_N == pcState) {
+ return Result.loading("loading_type");
+ }
+
ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectHoldOrderByMemberIdAndId(memberEntity.getId(), changeBondDto.getId());
if (holdOrderEntity == null) {
return Result.fail("订单不存在");
@@ -902,10 +926,12 @@
}
BigDecimal available = walletContractEntity.getAvailableBalance();
- if (totalProfitOrLess.compareTo(BigDecimal.ZERO) <= 0) {
- available = available.add(totalProfitOrLess);
- if (available.compareTo(BigDecimal.ZERO) <= 0) {
- available = BigDecimal.ZERO;
+ if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == memberEntity.getContractPositionType()) {
+ if (totalProfitOrLess.compareTo(BigDecimal.ZERO) <= 0) {
+ available = available.add(totalProfitOrLess);
+ if (available.compareTo(BigDecimal.ZERO) <= 0) {
+ available = BigDecimal.ZERO;
+ }
}
}
--
Gitblit v1.9.1