Commit 6804ef3a by zihan

bug调整

parent a418d46b
...@@ -50,17 +50,22 @@ class Strategy3 { ...@@ -50,17 +50,22 @@ class Strategy3 {
let amount = result[7]; let amount = result[7];
let returnAmount = result[8]; let returnAmount = result[8];
// console.log({buyRemark, sellRemark, returnRemark}); // console.log({buyRemark, sellRemark, returnRemark});
const sellDelay = endTime - this.collector.getSymbolEventTime(sellSymbol);
if(this._logDelay()){ if(this._logDelay()){
const buySymbol = this.collector.getSymbol(baseCurrency1, midCurrency); const buySymbol = this.collector.getSymbol(baseCurrency1, midCurrency);
const sellSymbol = this.collector.getSymbol(midCurrency, baseCurrency2); const sellSymbol = this.collector.getSymbol(midCurrency, baseCurrency2);
const buyDelay = endTime - this.collector.getSymbolEventTime(buySymbol); const buyDelay = endTime - this.collector.getSymbolEventTime(buySymbol);
const sellDelay = endTime - this.collector.getSymbolEventTime(sellSymbol);
console.log('买入交易对延迟:' + buyDelay + " 卖出交易对延迟:" + sellDelay); console.log('买入交易对延迟:' + buyDelay + " 卖出交易对延迟:" + sellDelay);
if(buyDelay> 5000 || sellDelay > 5000){ // if(buyDelay> 5000 || sellDelay > 5000){
// console.log('延时过大,放弃该轮交易');
// return false;
// }
}
if(sellDelay > 5000){
console.log('延时过大,放弃该轮交易'); console.log('延时过大,放弃该轮交易');
return false; return false;
} }
}
const service = this.service; const service = this.service;
let savedRecord = null; let savedRecord = null;
const finishedOrders = []; const finishedOrders = [];
......
...@@ -43,7 +43,7 @@ function testCollector(){ ...@@ -43,7 +43,7 @@ function testCollector(){
// const strategy3 = new BiboxStrategy3(collector); // const strategy3 = new BiboxStrategy3(collector);
// strategy3.run(); // strategy3.run();
} }
testCollector(); // testCollector();
function printCurrency(){ function printCurrency(){
const currentArray = [,'ETH','BTC','LTC','BCH','USDT','USD','RMB',"RCN","WINGS","TRX","LEND","CMT","POWR","HSR","GAS","RDN","TNT","OAX" const currentArray = [,'ETH','BTC','LTC','BCH','USDT','USD','RMB',"RCN","WINGS","TRX","LEND","CMT","POWR","HSR","GAS","RDN","TNT","OAX"
...@@ -121,7 +121,7 @@ function printCurrency(){ ...@@ -121,7 +121,7 @@ function printCurrency(){
} }
}) })
} }
// printCurrency() printCurrency()
function testOrder(){ function testOrder(){
const order = new Order(); const order = new Order();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment