1、主单增加减仓、加仓状态

2、bug修复

services/binanceservice/binancerest.go

@@ -9,6 +9,7 @@ import (
 	"go-admin/common/global"
 	"go-admin/common/helper"
 	"go-admin/models"
+	"go-admin/models/binancedto"
 	"go-admin/models/spot"
 	"go-admin/pkg/httputils"
 	"go-admin/pkg/utility"
@@ -529,3 +530,61 @@ func (e SpotRestApi) GetSpotSymbolLastPrice(targetSymbol string) (lastPrice deci
 	// }
 	return lastPrice
 }
+
+func (e SpotRestApi) GetOrderByOrderSn(symbol, orderSn string, apiUserInfo DbModels.LineApiUser) (order binancedto.BinanceSpotOrder, err error) {
+	result := binancedto.BinanceSpotOrder{}
+	params := map[string]string{
+		"symbol":            symbol,
+		"origClientOrderId": orderSn,
+	}
+
+	client := GetClient(&apiUserInfo)
+
+	body, code, err := client.SendSpotAuth("/api/v3/order", "GET", params)
+	if err != nil || code != 200 {
+		log.Error("查询现货委托 参数:", params)
+		log.Error("查询现货委托失败 code:", code)
+		log.Error("查询现货委托失败 err:", err)
+		dataMap := make(map[string]interface{})
+		if err.Error() != "" {
+			if err := sonic.Unmarshal([]byte(err.Error()), &dataMap); err != nil {
+				return result, fmt.Errorf("api_id:%d 交易对:%s 查询订单失败:%+v", apiUserInfo.Id, symbol, err.Error())
+			}
+		}
+
+		code, ok := dataMap["code"]
+		if ok {
+			return result, fmt.Errorf("api_id:%d 交易对:%s 查询订单失败:%s", apiUserInfo.Id, symbol, ErrorMaps[code.(float64)])
+		}
+		if strings.Contains(err.Error(), "Unknown order sent.") {
+			return result, fmt.Errorf("api_id:%d 交易对:%s 查询订单失败:%+v", apiUserInfo.Id, symbol, ErrorMaps[-2011])
+		}
+		return result, fmt.Errorf("api_id:%d 交易对:%s 查询订单失败:%+v", apiUserInfo.Id, symbol, err.Error())
+	}
+
+	sonic.Unmarshal(body, &result)
+
+	if result.OrderID == 0 {
+		return result, fmt.Errorf("api_id:%d 交易对:%s 查询订单失败:%+v", apiUserInfo.Id, symbol, "订单不存在")
+	}
+
+	return result, nil
+}
+
+/*
+查询现货委托
+*/
+func (e SpotRestApi) GetOrderByOrderSnLoop(symbol, ordersn string, apiUserInfo DbModels.LineApiUser, retryCount int) (order binancedto.BinanceSpotOrder, err error) {
+	result, err := e.GetOrderByOrderSn(symbol, ordersn, apiUserInfo)
+
+	if err != nil {
+		for x := 1; x < retryCount; x++ {
+			result, err = e.GetOrderByOrderSn(symbol, ordersn, apiUserInfo)
+			if err == nil {
+				break
+			}
+		}
+	}
+
+	return result, err
+}