1
This commit is contained in:
@ -192,6 +192,13 @@ func SpotStopLossTrigger(db *gorm.DB, stopOrder dto.StopLossRedisList, spotApi S
|
||||
return
|
||||
}
|
||||
|
||||
hasrecord, _ := helper.DefaultRedis.IsElementInList(key, item)
|
||||
|
||||
if !hasrecord {
|
||||
log.Debug("减仓缓存中不存在", item)
|
||||
return
|
||||
}
|
||||
|
||||
apiInfo, _ := GetApiInfo(takeOrder.ApiId)
|
||||
|
||||
if apiInfo.Id == 0 {
|
||||
@ -259,13 +266,6 @@ func JudgeSpotReduce(trade models.TradeSet) {
|
||||
return
|
||||
}
|
||||
|
||||
tradeSet, err := GetTradeSet(trade.Coin+trade.Currency, 0)
|
||||
|
||||
if err != nil {
|
||||
log.Error("获取交易设置失败")
|
||||
return
|
||||
}
|
||||
|
||||
for _, item := range reduceVal {
|
||||
reduceOrder := ReduceListItem{}
|
||||
if err := sonic.Unmarshal([]byte(item), &reduceOrder); err != nil {
|
||||
@ -282,14 +282,20 @@ func JudgeSpotReduce(trade models.TradeSet) {
|
||||
orderPrice.Cmp(decimal.Zero) > 0 &&
|
||||
tradePrice.Cmp(decimal.Zero) > 0 {
|
||||
|
||||
SpotReduceTrigger(db, reduceOrder, spotApi, setting, tradeSet, key, item)
|
||||
SpotReduceTrigger(db, reduceOrder, spotApi, setting, key, item)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 触发现货减仓
|
||||
func SpotReduceTrigger(db *gorm.DB, reduceOrder ReduceListItem, spotApi SpotRestApi, setting DbModels.LineSystemSetting, tradeSet models.TradeSet, key, item string) {
|
||||
func SpotReduceTrigger(db *gorm.DB, reduceOrder ReduceListItem, spotApi SpotRestApi, setting DbModels.LineSystemSetting, key, item string) {
|
||||
tradeSet, err := GetTradeSet(reduceOrder.Symbol, 0)
|
||||
|
||||
if err != nil {
|
||||
log.Error("获取交易设置失败")
|
||||
return
|
||||
}
|
||||
lock := helper.NewRedisLock(fmt.Sprintf(rediskey.SpotTrigger, reduceOrder.ApiId, reduceOrder.Symbol), 20, 5, 100*time.Millisecond)
|
||||
|
||||
if ok, err := lock.AcquireWait(context.Background()); err != nil {
|
||||
@ -302,6 +308,12 @@ func SpotReduceTrigger(db *gorm.DB, reduceOrder ReduceListItem, spotApi SpotRest
|
||||
log.Error("查询止盈单失败")
|
||||
return
|
||||
}
|
||||
hasrecord, _ := helper.DefaultRedis.IsElementInList(key, item)
|
||||
|
||||
if !hasrecord {
|
||||
log.Debug("减仓缓存中不存在", item)
|
||||
return
|
||||
}
|
||||
|
||||
apiInfo, _ := GetApiInfo(takeOrder.ApiId)
|
||||
|
||||
@ -325,7 +337,6 @@ func SpotReduceTrigger(db *gorm.DB, reduceOrder ReduceListItem, spotApi SpotRest
|
||||
return
|
||||
}
|
||||
price := reduceOrder.Price.Mul(decimal.NewFromInt(1).Sub(setting.ReducePremium.Div(decimal.NewFromInt(100)))).Truncate(int32(tradeSet.PriceDigit))
|
||||
num := utility.StrToDecimal(takeOrder.Num).Truncate(int32(tradeSet.AmountDigit))
|
||||
|
||||
params := OrderPlacementService{
|
||||
ApiId: reduceOrder.ApiId,
|
||||
@ -334,7 +345,7 @@ func SpotReduceTrigger(db *gorm.DB, reduceOrder ReduceListItem, spotApi SpotRest
|
||||
TimeInForce: "GTC",
|
||||
Symbol: reduceOrder.Symbol,
|
||||
Price: price,
|
||||
Quantity: num,
|
||||
Quantity: reduceOrder.Num,
|
||||
NewClientOrderId: reduceOrder.OrderSn,
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user