From c41c4bf20db7e287cbc3e7dcfa3a332499e5dbf4 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Tue, 13 Oct 2020 16:00:13 +0800
Subject: [PATCH] RFNC交易所
---
src/main/java/com/xcong/excoin/modules/blackchain/service/RocService.java | 1
src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java | 60 +++++++++++++++---------------
src/main/java/com/xcong/excoin/utils/CoinTypeConvert.java | 8 ++--
src/main/java/com/xcong/excoin/modules/symbols/constants/SymbolsConstats.java | 4 +-
src/main/java/com/xcong/excoin/websocket/TradePlateSendWebSocket.java | 6 +-
src/main/java/com/xcong/excoin/quartz/job/CoinTradeInitJob.java | 4 +-
6 files changed, 42 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/blackchain/service/RocService.java b/src/main/java/com/xcong/excoin/modules/blackchain/service/RocService.java
index 37465f0..422858d 100644
--- a/src/main/java/com/xcong/excoin/modules/blackchain/service/RocService.java
+++ b/src/main/java/com/xcong/excoin/modules/blackchain/service/RocService.java
@@ -9,6 +9,7 @@
*/
public class RocService {
+ // FIXME 改为对应的钱包地址
private final static String URL = "http://api.rocwallet.cc";
private final static String CREATE_WALLET= "/init/createaccount";
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 eb034ca..3457648 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
@@ -349,35 +349,35 @@
}
// 需要先
String phone = memberEntity.getPhone();
- if(!"13632989240".equals(phone) && !"15158130575".equals(phone)){
- if(OrderCoinsEntity.ORDERTYPE_BUY.equals(type)){
- // 不能超过800个
-
- if(amount!=null && amount.compareTo(new BigDecimal("800"))>0){
- return Result.fail("买入额度受限");
- }
- BigDecimal bigDecimal = orderCoinDealDao.sumTodayBuyAmount(memberId, symbol);
- if(bigDecimal==null){
- bigDecimal= BigDecimal.ZERO;
- }
- amount= amount==null?BigDecimal.ZERO:amount;
- bigDecimal = bigDecimal.add(amount);
- if(bigDecimal!=null && bigDecimal.compareTo(new BigDecimal("800"))>0){
- return Result.fail("买入额度受限");
- }
- // 挂单不能超过800
- BigDecimal bigDecimal1 = orderCoinDealDao.sumTodayEntrustCntBuyAmount(memberId, symbol);
- if(bigDecimal1==null){
- bigDecimal1=BigDecimal.ZERO;
- }
- bigDecimal1 = bigDecimal1.add(amount);
- if(bigDecimal1!=null && bigDecimal1.compareTo(new BigDecimal("800"))>0){
- return Result.fail("买入额度受限");
- }
- }else{
- return Result.fail("卖出受限");
- }
- }
+// if(!"13632989240".equals(phone) && !"15158130575".equals(phone)){
+// if(OrderCoinsEntity.ORDERTYPE_BUY.equals(type)){
+// // 不能超过800个
+//
+// if(amount!=null && amount.compareTo(new BigDecimal("800"))>0){
+// return Result.fail("买入额度受限");
+// }
+// BigDecimal bigDecimal = orderCoinDealDao.sumTodayBuyAmount(memberId, symbol);
+// if(bigDecimal==null){
+// bigDecimal= BigDecimal.ZERO;
+// }
+// amount= amount==null?BigDecimal.ZERO:amount;
+// bigDecimal = bigDecimal.add(amount);
+// if(bigDecimal!=null && bigDecimal.compareTo(new BigDecimal("800"))>0){
+// return Result.fail("买入额度受限");
+// }
+// // 挂单不能超过800
+// BigDecimal bigDecimal1 = orderCoinDealDao.sumTodayEntrustCntBuyAmount(memberId, symbol);
+// if(bigDecimal1==null){
+// bigDecimal1=BigDecimal.ZERO;
+// }
+// bigDecimal1 = bigDecimal1.add(amount);
+// if(bigDecimal1!=null && bigDecimal1.compareTo(new BigDecimal("800"))>0){
+// return Result.fail("买入额度受限");
+// }
+// }else{
+// return Result.fail("卖出受限");
+// }
+// }
BigDecimal nowPriceinBigDecimal = price;
//查询当前价
@@ -886,7 +886,7 @@
@Transactional(rollbackFor = Exception.class)
public void dealEntrustCoinOrder() {
List<String> ignoreTypes = new ArrayList<>();
- ignoreTypes.add(SymbolsConstats.ROC);
+ ignoreTypes.add(SymbolsConstats.RFNC);
List<OrderCoinsEntity> list = orderCoinsDao.selectAllEntrustingCoinOrderList(ignoreTypes);
if (CollUtil.isNotEmpty(list)) {
for (OrderCoinsEntity orderCoinsEntity : list) {
diff --git a/src/main/java/com/xcong/excoin/modules/symbols/constants/SymbolsConstats.java b/src/main/java/com/xcong/excoin/modules/symbols/constants/SymbolsConstats.java
index 2ae5ded..663226f 100644
--- a/src/main/java/com/xcong/excoin/modules/symbols/constants/SymbolsConstats.java
+++ b/src/main/java/com/xcong/excoin/modules/symbols/constants/SymbolsConstats.java
@@ -5,8 +5,8 @@
public class SymbolsConstats {
public final static List<String> EXCHANGE_SYMBOLS = new ArrayList<>();
- public final static String ROC = "ROC";
+ public final static String RFNC = "RFNC";
static {
- EXCHANGE_SYMBOLS.add("ROC");
+ EXCHANGE_SYMBOLS.add("RFNC");
}
}
diff --git a/src/main/java/com/xcong/excoin/quartz/job/CoinTradeInitJob.java b/src/main/java/com/xcong/excoin/quartz/job/CoinTradeInitJob.java
index 2b8c6cb..2093e84 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/CoinTradeInitJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/CoinTradeInitJob.java
@@ -70,7 +70,7 @@
@PostConstruct
public void initCoinTrade() {
log.info("#=======撮合交易器开启=======#");
- String symbol = SymbolsConstats.ROC;
+ String symbol = SymbolsConstats.RFNC;
CoinTrader newTrader = new CoinTrader(symbol);
newTrader.setExchangeProducer(exchangeProducer);
//newTrader.setKafkaTemplate(kafkaTemplate);
@@ -106,7 +106,7 @@
processor.initializeThumb();
//processor.initializeUsdRate();
processor.setIsHalt(false);
- List<ExchangeTrade> nekk = orderCoinDealDao.selectOrderCoinDealByTime(SymbolsConstats.ROC, null, null);
+ List<ExchangeTrade> nekk = orderCoinDealDao.selectOrderCoinDealByTime(SymbolsConstats.RFNC, null, null);
processor.process(nekk);
String symbolUsdt = symbol;
if(!symbol.contains("USDT")){
diff --git a/src/main/java/com/xcong/excoin/utils/CoinTypeConvert.java b/src/main/java/com/xcong/excoin/utils/CoinTypeConvert.java
index d0d5c68..04f2268 100644
--- a/src/main/java/com/xcong/excoin/utils/CoinTypeConvert.java
+++ b/src/main/java/com/xcong/excoin/utils/CoinTypeConvert.java
@@ -23,7 +23,7 @@
case "etcusdt":
return "ETC/USDT";
case "rocusdt":
- return "ROC/USDT";
+ return "RFNC/USDT";
default:
return null;
}
@@ -33,7 +33,7 @@
switch (symbol) {
case "BTC/USDT":
return "btcusdt";
- case "ROC/USDT":
+ case "RFNC/USDT":
return "rocusdt";
default:
return null;
@@ -56,8 +56,8 @@
return "EOS_NEW_PRICE";
case "ETC/USDT":
return "ETC_NEW_PRICE";
- case "ROC/USDT":
- return "ROC_NEW_PRICE";
+ case "RFNC/USDT":
+ return "RFNC_NEW_PRICE";
default:
return null;
}
diff --git a/src/main/java/com/xcong/excoin/websocket/TradePlateSendWebSocket.java b/src/main/java/com/xcong/excoin/websocket/TradePlateSendWebSocket.java
index 3889dff..d02c464 100644
--- a/src/main/java/com/xcong/excoin/websocket/TradePlateSendWebSocket.java
+++ b/src/main/java/com/xcong/excoin/websocket/TradePlateSendWebSocket.java
@@ -95,9 +95,9 @@
// 发送一次盘口
CoinTraderFactory factory = SpringContextHolder.getBean(CoinTraderFactory.class);
// 发送订阅消息
- String nekk = factory.getTrader(SymbolsConstats.ROC).sendTradePlateMessage();
+ String nekk = factory.getTrader(SymbolsConstats.RFNC).sendTradePlateMessage();
SubResultModel subResultModel = new SubResultModel();
- subResultModel.setId("rocusdt");
+ subResultModel.setId("frncusdt");
subResultModel.setSubbed(sub);
synchronized (session) {
try {
@@ -219,7 +219,7 @@
String key = "KINE_{}_{}";
// 币币k线数据
//key = StrUtil.format(key, symbol, period);
- key = StrUtil.format(key, "ROC/USDT", period);
+ key = StrUtil.format(key, "RFNC/USDT", period);
RedisUtils bean = SpringContextHolder.getBean(RedisUtils.class);
Object o = bean.get(key);
List<CandlestickModel> candlestickModels = new ArrayList<>();
--
Gitblit v1.9.1