From 629f5bdc2982e83fe13812f3a44a910ced630a00 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 15 Apr 2021 10:18:41 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 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 576bac9..c3f9a97 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
@@ -15,6 +15,7 @@
import com.xcong.excoin.common.enumerates.RabbitPriceTypeEnum;
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.common.system.service.CommonService;
+import com.xcong.excoin.modules.coin.service.CoinService;
import com.xcong.excoin.modules.contract.dao.ContractEntrustOrderDao;
import com.xcong.excoin.modules.contract.dao.ContractHoldOrderDao;
import com.xcong.excoin.modules.contract.dao.ContractOrderDao;
@@ -108,6 +109,9 @@
@Autowired
private FollowProducer followProducer;
+ @Autowired
+ private CoinService coinService;
+
@Transactional(rollbackFor = Exception.class)
@Override
public Result submitOrder(SubmitOrderDto submitOrderDto) {
@@ -121,6 +125,14 @@
return Result.loading("loading_type");
}
+ BigDecimal total = coinService.getAllWalletAmount(memberIdLong);
+ Map<String, Object> data = new HashMap<>();
+ if (total.compareTo(AppContants.BASE_MIN_AMOUNT) > 0) {
+ data.put("baseUrl", AppContants.BASE_URL_L2);
+ } else {
+ data.put("baseUrl", AppContants.BASE_URL_L1);
+ }
+
// 判断当前对应的持仓/委托
if (memberEntity.getContractPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
List<ContractHoldOrderEntity> holdList = contractHoldOrderDao.selectMemberHoldOrderByPositionType(ContractEntrustOrderEntity.POSITION_TYPE_ALL, memberEntity.getId());
@@ -130,7 +142,9 @@
}
// 逐仓逻辑
- return doPositionTypeForAdd(submitOrderDto, memberEntity);
+ Result result = doPositionTypeForAdd(submitOrderDto, memberEntity);
+ result.setData(data);
+ return result;
} else {
List<ContractHoldOrderEntity> holdList = contractHoldOrderDao.selectMemberHoldOrderByPositionType(ContractEntrustOrderEntity.POSITION_TYPE_ADD, memberEntity.getId());
List<ContractEntrustOrderEntity> entrustList = contractEntrustOrderDao.selectMemberEntrustOrderByPositionType(ContractEntrustOrderEntity.POSITION_TYPE_ADD, memberEntity.getId());
@@ -139,7 +153,9 @@
}
// 全仓逻辑
- return doPositionTypeForWhole(submitOrderDto, memberEntity);
+ Result result = doPositionTypeForWhole(submitOrderDto, memberEntity);
+ result.setData(data);
+ return result;
}
}
@@ -281,11 +297,7 @@
ThreadPoolUtils.sendWholePrice(memberEntity.getId());
// 提交成功
- Result result = Result.ok(MessageSourceUtils.getString("member_service_0024"));
- Map<String, Object> data = new HashMap<>();
- data.put("baseUrl", AppContants.BASE_URL_L2);
- result.setData(data);
- return result;
+ return Result.ok(MessageSourceUtils.getString("member_service_0024"));
}
// 提交失败
return Result.fail(MessageSourceUtils.getString("member_service_0067"));
@@ -393,11 +405,7 @@
// ThreadPoolUtils.sendFollowOrderTask(holdOrderEntity.getId());
}
// 提交成功
- Result result = Result.ok(MessageSourceUtils.getString("member_service_0024"));
- Map<String, Object> data = new HashMap<>();
- data.put("baseUrl", AppContants.BASE_URL_L2);
- result.setData(data);
- return result;
+ return Result.ok(MessageSourceUtils.getString("member_service_0024"));
}
// 提交失败
return Result.fail(MessageSourceUtils.getString("member_service_0067"));
--
Gitblit v1.9.1