From aa0dc89a9b7e9efdb449c688b67401fcfaf6c166 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 23 Sep 2020 17:43:19 +0800
Subject: [PATCH] 20200923
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java | 35 +----------------------------------
1 files changed, 1 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
index 47107d3..bda46fc 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
@@ -354,45 +354,12 @@
return Result.fail(MessageSourceUtils.getString("member_service_0004"));
}
//获取用户ID
- Long memberId = LoginUserUtils.getAppLoginUser().getId();
- MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
-
- List<ContractHoldOrderEntity> list = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbol(memberEntity.getId(), symbol, 1);
- BigDecimal totalProfitOrLoss = BigDecimal.ZERO;
- if (CollUtil.isNotEmpty(list)) {
- for (ContractHoldOrderEntity holdOrderEntity : list) {
- // 获取最新价
- BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderEntity.getSymbol())));
- BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(holdOrderEntity.getSymbol());
- // 盈亏
- BigDecimal rewardRatio = BigDecimal.ZERO;
- // 开多
- if (ContractHoldOrderEntity.OPENING_TYPE_MORE == holdOrderEntity.getOpeningType()) {
- // (最新价-开仓价)*规格*张数
- rewardRatio = newPrice.subtract(holdOrderEntity.getOpeningPrice()).multiply(lotNumber).multiply(new BigDecimal(holdOrderEntity.getSymbolCntSale()));
- // 开空
- } else {
- // (开仓价-最新价)*规格*张数
- rewardRatio = holdOrderEntity.getOpeningPrice().subtract(newPrice).multiply(lotNumber).multiply(new BigDecimal(holdOrderEntity.getSymbolCntSale()));
- }
-
- if (memberEntity.getIsProfit() == MemberEntity.IS_PROFIT_Y) {
- PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();
- if (rewardRatio.compareTo(BigDecimal.ZERO) > -1) {
- rewardRatio = rewardRatio.multiply(BigDecimal.ONE.subtract(tradeSettingEntity.getProfitParam()));
- }
- }
- totalProfitOrLoss = totalProfitOrLoss.add(rewardRatio);
- }
- }
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
String walletCode = MemberWalletCoinEnum.WALLETCOINCODE.getValue();
MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberId, walletCode);
BigDecimal availableBalance = walletContract.getAvailableBalance();
// 扣币
- if (totalProfitOrLoss.compareTo(BigDecimal.ZERO) < 0) {
- availableBalance = availableBalance.add(totalProfitOrLoss);
- }
BigDecimal availableSubtract = availableBalance.subtract(balance);
if (availableSubtract.compareTo(BigDecimal.ZERO) < 0) {
return Result.fail(MessageSourceUtils.getString("member_service_0007"));
--
Gitblit v1.9.1