1

services/binanceservice/futuresrest.go

@@ -303,12 +303,12 @@ func handleClosePosition(db *gorm.DB, preOrder *DbModels.LinePreOrder) {
 	removeFutLossAndAddPosition(preOrder.MainId, preOrder.OrderSn)
 	removePosition(db, preOrder)
 
-	futApi := FutRestApi{}
 	apiUserInfo, _ := GetApiInfo(preOrder.ApiId)
 
 	if apiUserInfo.Id > 0 {
-		if err := futApi.CancelAllFutOrder(apiUserInfo, preOrder.Symbol); err != nil {
-			logger.Errorf("止盈单成功 取消其它订单失败 订单号：%s:", err)
+		mainIds := []int{preOrder.MainId}
+		if err := cancelMainOrders(mainIds, db, apiUserInfo, preOrder.Symbol, false); err != nil {
+			logger.Errorf("平仓单成功 取消其它订单失败 订单号：%s:", err)
 		}
 	}
 

services/scriptservice/order.go

@@ -1,17 +1,19 @@
 package scriptservice
 
 import (
-	"github.com/bytedance/sonic"
-	log "github.com/go-admin-team/go-admin-core/logger"
-	sysservice "github.com/go-admin-team/go-admin-core/sdk/service"
 	"go-admin/app/admin/models"
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/const/rediskey"
 	"go-admin/common/helper"
-	"gorm.io/gorm"
+	"go-admin/pkg/utility"
 	"strings"
 	"sync"
+
+	"github.com/bytedance/sonic"
+	log "github.com/go-admin-team/go-admin-core/logger"
+	sysservice "github.com/go-admin-team/go-admin-core/sdk/service"
+	"gorm.io/gorm"
 )
 
 type PreOrder struct {
@@ -23,8 +25,9 @@ func (receiver *PreOrder) AddOrder(orm *gorm.DB) {
 	var wg sync.WaitGroup
 	for i := 1; i <= GoroutineNum; i++ {
 		wg.Add(1)
-		go workerWithLock(orm, &wg)
-
+		utility.SafeGo(func() {
+			workerWithLock(orm, &wg)
+		})
 	}
 	wg.Wait()
 }