From 05914963848b06637eccff5085004ddb591d5d02 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 02 Jun 2020 21:59:54 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 29 +++++++++++++++++++++++++++++
src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java | 6 ++++++
src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java | 2 ++
3 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
index 51c965e..b900fbe 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java
@@ -82,4 +82,10 @@
return null;
}
+ @ApiOperation(value = "获取合约页面资产信息")
+ @GetMapping(value = "/findContractMoneyInfo")
+ public Result findContractMoneyInfo(@ApiParam(name = "symbol", value = "币种", required = true, example = "BTC/USDT") @RequestParam(value = "symbol") String symbol) {
+ return null;
+ }
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java b/src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java
index 117cc19..5ac43ea 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java
@@ -34,4 +34,6 @@
public Result changeBond(ChangeBondDto changeBondDto);
+ public Result findContractMoneyInfo(String symbol);
+
}
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 a984afb..cb12786 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
@@ -9,6 +9,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.contract.dao.ContractEntrustOrderDao;
import com.xcong.excoin.modules.contract.dao.ContractHoldOrderDao;
import com.xcong.excoin.modules.contract.dao.ContractOrderDao;
import com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity;
@@ -56,6 +57,9 @@
@Resource
private ContractOrderDao contractOrderDao;
+
+ @Resource
+ private ContractEntrustOrderDao contractEntrustOrderDao;
@Resource
private CommonService commonService;
@@ -431,4 +435,29 @@
}
return Result.fail("调整失败");
}
+
+ @Override
+ public Result findContractMoneyInfo(String symbol) {
+ MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
+
+ PlatformTradeSettingEntity tradeSetting = cacheSettingUtils.getTradeSetting();
+ // 获取最新价
+ BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(symbol)));
+
+ // 当前合约委托单
+ List<ContractEntrustOrderEntity> entrustOrderEntities = contractEntrustOrderDao.selectEntrustOrderListByMemberId(memberEntity.getId());
+
+ // 当前持仓列表
+ List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListByMemberId(memberEntity.getId());
+
+ // 冻结保证金 -- 即委托单中的保证金
+ BigDecimal frozenBondAmount = BigDecimal.ZERO;
+ if (CollUtil.isNotEmpty(entrustOrderEntities)) {
+ for (ContractEntrustOrderEntity entrustOrderEntity : entrustOrderEntities) {
+ frozenBondAmount = frozenBondAmount.add(entrustOrderEntity.getBondAmount());
+ }
+ }
+
+ return null;
+ }
}
--
Gitblit v1.9.1