update
This commit is contained in:
parent
bc91a10782
commit
bdc18ce39c
2 changed files with 28 additions and 1 deletions
|
|
@ -19,4 +19,9 @@ export interface Analysis {
|
||||||
numberTouch200: number;
|
numberTouch200: number;
|
||||||
numberMacdCrossUp: number;
|
numberMacdCrossUp: number;
|
||||||
numberMacdCrossDown: number;
|
numberMacdCrossDown: number;
|
||||||
|
currentBB: {
|
||||||
|
upper: number;
|
||||||
|
middle: number;
|
||||||
|
lower: number;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -83,8 +83,17 @@ export class IndicatorService {
|
||||||
numberMacdCrossDown: wave.numberMacdCrossDown,
|
numberMacdCrossDown: wave.numberMacdCrossDown,
|
||||||
isMacdUpper: false,
|
isMacdUpper: false,
|
||||||
isMacdLower: false,
|
isMacdLower: false,
|
||||||
|
currentBB: {
|
||||||
|
upper: 0,
|
||||||
|
middle: 0,
|
||||||
|
lower: 0,
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
analysis.currentBB.upper = bb[0].upper;
|
||||||
|
analysis.currentBB.middle = bb[0].middle;
|
||||||
|
analysis.currentBB.lower = bb[0].lower;
|
||||||
|
|
||||||
if (ema34[0] > ema200[0]) {
|
if (ema34[0] > ema200[0]) {
|
||||||
if (wave.trend === "Bearish") {
|
if (wave.trend === "Bearish") {
|
||||||
analysis.numberTouch200 = 0;
|
analysis.numberTouch200 = 0;
|
||||||
|
|
@ -221,10 +230,23 @@ export class IndicatorService {
|
||||||
(max, c) => Math.max(max, c.high),
|
(max, c) => Math.max(max, c.high),
|
||||||
Number.MIN_SAFE_INTEGER
|
Number.MIN_SAFE_INTEGER
|
||||||
);
|
);
|
||||||
|
let entry = candles[0].close;
|
||||||
|
if (side === "buy") {
|
||||||
|
if (analysis.currentBB.upper < candles[0].close) {
|
||||||
|
entry = analysis.currentBB.upper;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (side === "sell") {
|
||||||
|
if (analysis.currentBB.lower > candles[0].close) {
|
||||||
|
entry = analysis.currentBB.lower;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const order: Order = {
|
const order: Order = {
|
||||||
symbol: analysis.symbol,
|
symbol: analysis.symbol,
|
||||||
side,
|
side,
|
||||||
entry: candles[0].close,
|
entry,
|
||||||
stopLoss: side === "buy" ? lowestPrice : highestPrice,
|
stopLoss: side === "buy" ? lowestPrice : highestPrice,
|
||||||
volume: 1,
|
volume: 1,
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue