From cd7a407f3214092ad2b65f19ee69c14cd9852a50 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 31 May 2020 18:23:47 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
index f942398..5d4ebf0 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
@@ -43,7 +43,9 @@
import com.xcong.excoin.modules.platform.dao.PlatformCnyUsdtExchangeDao;
import com.xcong.excoin.modules.platform.dao.TradeSettingDao;
import com.xcong.excoin.modules.platform.entity.PlatformTradeSettingEntity;
+import com.xcong.excoin.utils.CoinTypeConvert;
import com.xcong.excoin.utils.MessageSourceUtils;
+import com.xcong.excoin.utils.RedisUtils;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -67,6 +69,8 @@
OrderCoinDealDao orderCoinDealDao;
@Resource
MemberAccountFlowEntityDao memberAccountFlowEntityDao;
+ @Resource
+ RedisUtils redisUtils;
@Override
public String generateSimpleSerialno(String userId) {
@@ -110,12 +114,8 @@
//获取USDT的币币账户信息
MemberWalletCoinEntity walletCoinUsdt = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId,
MemberWalletCoinEnum.WALLETCOINCODE.getValue());
- /**
- * todo
- */
- //获取某个币种的收盘价
- //Double closePrice = symbolsService.getCloseSymbolsBySymbolsName(symbol+"/USDT");
- BigDecimal closePrice = new BigDecimal("100.0000");
+
+ BigDecimal closePrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(symbol+"/USDT")));
List<MemberSelectSymbolsEntity> memSymbols = memberSelectSymbolsDao.selectSymbolByMemIdAndSymbol(memberId, symbol);
@@ -158,13 +158,9 @@
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
- /**
- * todo
- */
//查询当前价
- //BigDecimal nowPrice = new BigDecimal(redisUtil.getString(CoinTypeConConvert.convertToKey(symbol+"/USDT")));
+ BigDecimal nowPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(symbol+"/USDT")));
- BigDecimal nowPrice = new BigDecimal("10.0000");
// 获取交易管理的杠杠倍率，手续费率等信息，由平台进行设置
symbol = symbol.toUpperCase();
MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, symbol);
--
Gitblit v1.9.1