1暂时提交

app/admin/apis/line_api_user.go

@@ -120,6 +120,11 @@ func (e LineApiUser) Insert(c *gin.Context) {
 	// 设置创建人
 	req.SetCreateBy(user.GetUserId(c))
 
+	if err := req.Valid(); err != nil {
+		e.Error(500, err, err.Error())
+		return
+	}
+
 	err = s.Insert(&req)
 	if err != nil {
 		e.Error(500, err, fmt.Sprintf("创建api用户管理失败，\r\n失败信息 %s", err.Error()))
@@ -153,6 +158,12 @@ func (e LineApiUser) Update(c *gin.Context) {
 		e.Error(500, err, err.Error())
 		return
 	}
+
+	if err := req.Valid(); err != nil {
+		e.Error(500, err, err.Error())
+		return
+	}
+
 	req.SetUpdateBy(user.GetUserId(c))
 	p := actions.GetPermissionFromContext(c)
 
@@ -267,3 +278,74 @@ func (e LineApiUser) GetMainUser(c *gin.Context) {
 	}
 	e.OK(list, "操作成功")
 }
+
+// GetUnBindApiUser 获取未绑定下反单api用户
+func (e LineApiUser) GetUnBindReverseApiUser(c *gin.Context) {
+	s := service.LineApiUser{}
+	req := dto.GetUnBindReverseReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.Query, binding.Form).
+		MakeService(&s.Service).
+		Errors
+
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	datas := make([]dto.UnBindReverseResp, 0)
+
+	err = s.GetUnBindApiUser(&req, &datas)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("获取失败，\r\n失败信息 %s", err.Error()))
+		return
+	}
+
+	e.OK(datas, "查询成功")
+}
+
+// 获取反单api用户选项
+func (e LineApiUser) GetReverseApiOptions(c *gin.Context) {
+	req := dto.GetReverseApiOptionsReq{}
+	s := service.LineApiUser{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	list := make([]models.LineApiUser, 0)
+	err = s.GetReverseApiOptions(&req, &list)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("获取失败，\r\n失败信息 %s", err.Error()))
+		return
+	}
+	e.OK(list, "操作成功")
+}
+
+// 获取所有启用的反单api用户
+func (e LineApiUser) GetReverseApiOptionsAll(c *gin.Context) {
+	s := service.LineApiUser{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	list := make([]dto.LineApiUserOptionResp, 0)
+	err = s.GetReverseApiOptionsAll(&list)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("获取失败，\r\n失败信息 %s", err.Error()))
+		return
+	}
+	e.OK(list, "操作成功")
+}

app/admin/apis/line_pre_order.go

@@ -3,7 +3,9 @@ package apis
 import (
 	"errors"
 	"fmt"
+	"go-admin/common/const/rediskey"
 	"go-admin/common/global"
+	"go-admin/common/helper"
 	"strings"
 
 	"github.com/gin-gonic/gin"
@@ -295,8 +297,13 @@ func (e LinePreOrder) AddPreOrder(c *gin.Context) {
 	errs := make([]error, 0)
 	errStr := make([]string, 0)
 	var msg string
-
-	if err := s.AddPreOrderCheck(&req, p, &errs); err != nil {
+	var tickerSymbol string
+	if req.SymbolType == global.SYMBOL_SPOT {
+		tickerSymbol = helper.DefaultRedis.Get(rediskey.SpotSymbolTicker).Val()
+	} else {
+		tickerSymbol = helper.DefaultRedis.Get(rediskey.FutSymbolTicker).Val()
+	}
+	if err := s.AddPreOrderCheck(&req, p, &errs, tickerSymbol); err != nil {
 		e.Error(500, err, err.Error())
 		return
 	}

app/admin/apis/line_price_limit.go

@@ -2,6 +2,7 @@ package apis
 
 import (
 	"fmt"
+
 	"github.com/gin-gonic/gin"
 	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
@@ -193,6 +194,7 @@ func (e LinePriceLimit) Delete(c *gin.Context) {
 	e.OK(req.GetId(), "删除成功")
 }
 
+// aicoin数据同步
 func (e LinePriceLimit) UpRange(c *gin.Context) {
 	s := service.LinePriceLimit{}
 	err := e.MakeContext(c).

app/admin/apis/line_reverse_order.go

@@ -0,0 +1,198 @@
+package apis
+
+import (
+    "fmt"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
+
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/service"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/actions"
+)
+
+type LineReverseOrder struct {
+	api.Api
+}
+
+// GetPage 获取反单下单列表列表
+// @Summary 获取反单下单列表列表
+// @Description 获取反单下单列表列表
+// @Tags 反单下单列表
+// @Param orderSn query string false "订单号"
+// @Param orderId query string false "币安订单号"
+// @Param followOrderSn query string false "跟随币安订单号"
+// @Param orderType query int false "订单类型 0-主单 1-止损单 2-加仓 3-减仓"
+// @Param positionSide query string false "持仓方向 LONG-多 SHORT-空"
+// @Param side query string false "买卖方向 SELL-卖 BUY-买"
+// @Param status query int false "状态 1-待下单 2-已下单 3-已成交 4-已平仓 5-已止损"
+// @Param pageSize query int false "页条数"
+// @Param pageIndex query int false "页码"
+// @Success 200 {object} response.Response{data=response.Page{list=[]models.LineReverseOrder}} "{"code": 200, "data": [...]}"
+// @Router /api/v1/line-reverse-order [get]
+// @Security Bearer
+func (e LineReverseOrder) GetPage(c *gin.Context) {
+    req := dto.LineReverseOrderGetPageReq{}
+    s := service.LineReverseOrder{}
+    err := e.MakeContext(c).
+        MakeOrm().
+        Bind(&req).
+        MakeService(&s.Service).
+        Errors
+   	if err != nil {
+   		e.Logger.Error(err)
+   		e.Error(500, err, err.Error())
+   		return
+   	}
+
+	p := actions.GetPermissionFromContext(c)
+	list := make([]models.LineReverseOrder, 0)
+	var count int64
+
+	err = s.GetPage(&req, p, &list, &count)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("获取反单下单列表失败，\r\n失败信息 %s", err.Error()))
+        return
+	}
+
+	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
+}
+
+// Get 获取反单下单列表
+// @Summary 获取反单下单列表
+// @Description 获取反单下单列表
+// @Tags 反单下单列表
+// @Param id path int false "id"
+// @Success 200 {object} response.Response{data=models.LineReverseOrder} "{"code": 200, "data": [...]}"
+// @Router /api/v1/line-reverse-order/{id} [get]
+// @Security Bearer
+func (e LineReverseOrder) Get(c *gin.Context) {
+	req := dto.LineReverseOrderGetReq{}
+	s := service.LineReverseOrder{}
+    err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	var object models.LineReverseOrder
+
+	p := actions.GetPermissionFromContext(c)
+	err = s.Get(&req, p, &object)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("获取反单下单列表失败，\r\n失败信息 %s", err.Error()))
+        return
+	}
+
+	e.OK( object, "查询成功")
+}
+
+// Insert 创建反单下单列表
+// @Summary 创建反单下单列表
+// @Description 创建反单下单列表
+// @Tags 反单下单列表
+// @Accept application/json
+// @Product application/json
+// @Param data body dto.LineReverseOrderInsertReq true "data"
+// @Success 200 {object} response.Response	"{"code": 200, "message": "添加成功"}"
+// @Router /api/v1/line-reverse-order [post]
+// @Security Bearer
+func (e LineReverseOrder) Insert(c *gin.Context) {
+    req := dto.LineReverseOrderInsertReq{}
+    s := service.LineReverseOrder{}
+    err := e.MakeContext(c).
+        MakeOrm().
+        Bind(&req).
+        MakeService(&s.Service).
+        Errors
+    if err != nil {
+        e.Logger.Error(err)
+        e.Error(500, err, err.Error())
+        return
+    }
+	// 设置创建人
+	req.SetCreateBy(user.GetUserId(c))
+
+	err = s.Insert(&req)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("创建反单下单列表失败，\r\n失败信息 %s", err.Error()))
+        return
+	}
+
+	e.OK(req.GetId(), "创建成功")
+}
+
+// Update 修改反单下单列表
+// @Summary 修改反单下单列表
+// @Description 修改反单下单列表
+// @Tags 反单下单列表
+// @Accept application/json
+// @Product application/json
+// @Param id path int true "id"
+// @Param data body dto.LineReverseOrderUpdateReq true "body"
+// @Success 200 {object} response.Response	"{"code": 200, "message": "修改成功"}"
+// @Router /api/v1/line-reverse-order/{id} [put]
+// @Security Bearer
+func (e LineReverseOrder) Update(c *gin.Context) {
+    req := dto.LineReverseOrderUpdateReq{}
+    s := service.LineReverseOrder{}
+    err := e.MakeContext(c).
+        MakeOrm().
+        Bind(&req).
+        MakeService(&s.Service).
+        Errors
+    if err != nil {
+        e.Logger.Error(err)
+        e.Error(500, err, err.Error())
+        return
+    }
+	req.SetUpdateBy(user.GetUserId(c))
+	p := actions.GetPermissionFromContext(c)
+
+	err = s.Update(&req, p)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("修改反单下单列表失败，\r\n失败信息 %s", err.Error()))
+        return
+	}
+	e.OK( req.GetId(), "修改成功")
+}
+
+// Delete 删除反单下单列表
+// @Summary 删除反单下单列表
+// @Description 删除反单下单列表
+// @Tags 反单下单列表
+// @Param data body dto.LineReverseOrderDeleteReq true "body"
+// @Success 200 {object} response.Response	"{"code": 200, "message": "删除成功"}"
+// @Router /api/v1/line-reverse-order [delete]
+// @Security Bearer
+func (e LineReverseOrder) Delete(c *gin.Context) {
+    s := service.LineReverseOrder{}
+    req := dto.LineReverseOrderDeleteReq{}
+    err := e.MakeContext(c).
+        MakeOrm().
+        Bind(&req).
+        MakeService(&s.Service).
+        Errors
+    if err != nil {
+        e.Logger.Error(err)
+        e.Error(500, err, err.Error())
+        return
+    }
+
+	// req.SetUpdateBy(user.GetUserId(c))
+	p := actions.GetPermissionFromContext(c)
+
+	err = s.Remove(&req, p)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("删除反单下单列表失败，\r\n失败信息 %s", err.Error()))
+        return
+	}
+	e.OK( req.GetId(), "删除成功")
+}

app/admin/apis/line_reverse_position.go

@@ -0,0 +1,255 @@
+package apis
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
+
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/service"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/actions"
+)
+
+type LineReversePosition struct {
+	api.Api
+}
+
+// GetPage 获取反单管理-仓位列表
+// @Summary 获取反单管理-仓位列表
+// @Description 获取反单管理-仓位列表
+// @Tags 反单管理-仓位
+// @Param apiId query int64 false "api_id"
+// @Param reverseApiId query int64 false "反单api_id"
+// @Param side query string false "买卖方向 BUY SELL"
+// @Param positionSide query string false "持仓方向 LONG SHORT"
+// @Param symbol query string false "交易对"
+// @Param pageSize query int false "页条数"
+// @Param pageIndex query int false "页码"
+// @Success 200 {object} response.Response{data=response.Page{list=[]models.LineReversePosition}} "{"code": 200, "data": [...]}"
+// @Router /api/v1/line-reverse-position [get]
+// @Security Bearer
+func (e LineReversePosition) GetPage(c *gin.Context) {
+	req := dto.LineReversePositionGetPageReq{}
+	s := service.LineReversePosition{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	p := actions.GetPermissionFromContext(c)
+	list := make([]dto.LineReversePositionListResp, 0)
+	var count int64
+
+	err = s.GetPage(&req, p, &list, &count)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("获取反单管理-仓位失败，\r\n失败信息 %s", err.Error()))
+		return
+	}
+
+	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
+}
+
+// Get 获取反单管理-仓位
+// @Summary 获取反单管理-仓位
+// @Description 获取反单管理-仓位
+// @Tags 反单管理-仓位
+// @Param id path int false "id"
+// @Success 200 {object} response.Response{data=models.LineReversePosition} "{"code": 200, "data": [...]}"
+// @Router /api/v1/line-reverse-position/{id} [get]
+// @Security Bearer
+func (e LineReversePosition) Get(c *gin.Context) {
+	req := dto.LineReversePositionGetReq{}
+	s := service.LineReversePosition{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	var object models.LineReversePosition
+
+	p := actions.GetPermissionFromContext(c)
+	err = s.Get(&req, p, &object)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("获取反单管理-仓位失败，\r\n失败信息 %s", err.Error()))
+		return
+	}
+
+	e.OK(object, "查询成功")
+}
+
+// Insert 创建反单管理-仓位
+// @Summary 创建反单管理-仓位
+// @Description 创建反单管理-仓位
+// @Tags 反单管理-仓位
+// @Accept application/json
+// @Product application/json
+// @Param data body dto.LineReversePositionInsertReq true "data"
+// @Success 200 {object} response.Response	"{"code": 200, "message": "添加成功"}"
+// @Router /api/v1/line-reverse-position [post]
+// @Security Bearer
+func (e LineReversePosition) Insert(c *gin.Context) {
+	req := dto.LineReversePositionInsertReq{}
+	s := service.LineReversePosition{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	// 设置创建人
+	req.SetCreateBy(user.GetUserId(c))
+
+	err = s.Insert(&req)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("创建反单管理-仓位失败，\r\n失败信息 %s", err.Error()))
+		return
+	}
+
+	e.OK(req.GetId(), "创建成功")
+}
+
+// Update 修改反单管理-仓位
+// @Summary 修改反单管理-仓位
+// @Description 修改反单管理-仓位
+// @Tags 反单管理-仓位
+// @Accept application/json
+// @Product application/json
+// @Param id path int true "id"
+// @Param data body dto.LineReversePositionUpdateReq true "body"
+// @Success 200 {object} response.Response	"{"code": 200, "message": "修改成功"}"
+// @Router /api/v1/line-reverse-position/{id} [put]
+// @Security Bearer
+func (e LineReversePosition) Update(c *gin.Context) {
+	req := dto.LineReversePositionUpdateReq{}
+	s := service.LineReversePosition{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	req.SetUpdateBy(user.GetUserId(c))
+	p := actions.GetPermissionFromContext(c)
+
+	err = s.Update(&req, p)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("修改反单管理-仓位失败，\r\n失败信息 %s", err.Error()))
+		return
+	}
+	e.OK(req.GetId(), "修改成功")
+}
+
+// Delete 删除反单管理-仓位
+// @Summary 删除反单管理-仓位
+// @Description 删除反单管理-仓位
+// @Tags 反单管理-仓位
+// @Param data body dto.LineReversePositionDeleteReq true "body"
+// @Success 200 {object} response.Response	"{"code": 200, "message": "删除成功"}"
+// @Router /api/v1/line-reverse-position [delete]
+// @Security Bearer
+func (e LineReversePosition) Delete(c *gin.Context) {
+	s := service.LineReversePosition{}
+	req := dto.LineReversePositionDeleteReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	// req.SetUpdateBy(user.GetUserId(c))
+	p := actions.GetPermissionFromContext(c)
+
+	err = s.Remove(&req, p)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("删除反单管理-仓位失败，\r\n失败信息 %s", err.Error()))
+		return
+	}
+	e.OK(req.GetId(), "删除成功")
+}
+
+// ClosePosition 平仓
+func (e LineReversePosition) ClosePosition(c *gin.Context) {
+	req := dto.LineReversePositionCloseReq{}
+	s := service.LineReversePosition{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	userId := user.GetUserId(c)
+	p := actions.GetPermissionFromContext(c)
+
+	err = s.ClosePosition(&req, p, userId)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("平仓失败，\r\n失败信息 %s", err.Error()))
+		return
+	}
+	e.OK(nil, "平仓成功")
+}
+
+// ClosePositionBatch 批量平仓
+func (e LineReversePosition) ClosePositionBatch(c *gin.Context) {
+	req := dto.LineReversePositionCloseBatchReq{}
+	s := service.LineReversePosition{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	userId := user.GetUserId(c)
+	p := actions.GetPermissionFromContext(c)
+	errs := make([]string, 0)
+
+	err = s.ClosePositionBatch(&req, p, userId, &errs)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("批量平仓失败，\r\n失败信息 %s", err.Error()))
+		return
+	}
+
+	if len(errs) > 0 {
+		content := strings.Join(errs, "</br>")
+
+		e.OK(content, "批量平仓部分失败")
+		return
+	}
+	e.OK(nil, "批量平仓成功")
+}

app/admin/apis/line_reverse_setting.go

@@ -0,0 +1,158 @@
+package apis
+
+import (
+	"fmt"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
+
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/service"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/actions"
+)
+
+type LineReverseSetting struct {
+	api.Api
+}
+
+// GetPage 获取反单下单配置列表
+// @Summary 获取反单下单配置列表
+// @Description 获取反单下单配置列表
+// @Tags 反单下单配置
+// @Param pageSize query int false "页条数"
+// @Param pageIndex query int false "页码"
+// @Success 200 {object} response.Response{data=response.Page{list=[]models.LineReverseSetting}} "{"code": 200, "data": [...]}"
+// @Router /api/v1/line-reverse-setting [get]
+// @Security Bearer
+func (e LineReverseSetting) GetPage(c *gin.Context) {
+	req := dto.LineReverseSettingGetPageReq{}
+	s := service.LineReverseSetting{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	p := actions.GetPermissionFromContext(c)
+	list := make([]models.LineReverseSetting, 0)
+	var count int64
+
+	err = s.GetPage(&req, p, &list, &count)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("获取反单下单配置失败，\r\n失败信息 %s", err.Error()))
+		return
+	}
+
+	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
+}
+
+// Get 获取反单下单配置
+// @Summary 获取反单下单配置
+// @Description 获取反单下单配置
+// @Tags 反单下单配置
+// @Param id path int false "id"
+// @Success 200 {object} response.Response{data=models.LineReverseSetting} "{"code": 200, "data": [...]}"
+// @Router /api/v1/line-reverse-setting/{id} [get]
+// @Security Bearer
+func (e LineReverseSetting) Get(c *gin.Context) {
+	req := dto.LineReverseSettingGetReq{}
+	s := service.LineReverseSetting{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	var object models.LineReverseSetting
+
+	p := actions.GetPermissionFromContext(c)
+	err = s.Get(&req, p, &object)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("获取反单下单配置失败，\r\n失败信息 %s", err.Error()))
+		return
+	}
+
+	e.OK(object, "查询成功")
+}
+
+// Insert 创建反单下单配置
+// @Summary 创建反单下单配置
+// @Description 创建反单下单配置
+// @Tags 反单下单配置
+// @Accept application/json
+// @Product application/json
+// @Param data body dto.LineReverseSettingInsertReq true "data"
+// @Success 200 {object} response.Response	"{"code": 200, "message": "添加成功"}"
+// @Router /api/v1/line-reverse-setting [post]
+// @Security Bearer
+func (e LineReverseSetting) Insert(c *gin.Context) {
+	req := dto.LineReverseSettingInsertReq{}
+	s := service.LineReverseSetting{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	// 设置创建人
+	req.SetCreateBy(user.GetUserId(c))
+
+	err = s.Insert(&req)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("创建反单下单配置失败，\r\n失败信息 %s", err.Error()))
+		return
+	}
+
+	e.OK(req.GetId(), "创建成功")
+}
+
+// Update 修改反单下单配置
+// @Summary 修改反单下单配置
+// @Description 修改反单下单配置
+// @Tags 反单下单配置
+// @Accept application/json
+// @Product application/json
+// @Param id path int true "id"
+// @Param data body dto.LineReverseSettingUpdateReq true "body"
+// @Success 200 {object} response.Response	"{"code": 200, "message": "修改成功"}"
+// @Router /api/v1/line-reverse-setting/{id} [put]
+// @Security Bearer
+func (e LineReverseSetting) Update(c *gin.Context) {
+	req := dto.LineReverseSettingUpdateReq{}
+	s := service.LineReverseSetting{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	req.SetUpdateBy(user.GetUserId(c))
+	p := actions.GetPermissionFromContext(c)
+
+	err = s.Update(&req, p)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("修改反单下单配置失败，\r\n失败信息 %s", err.Error()))
+		return
+	}
+	e.OK(req.GetId(), "修改成功")
+}

app/admin/apis/line_symbol.go

@@ -3,13 +3,13 @@ package apis
 import (
 	"errors"
 	"fmt"
+	"go-admin/common/const/rediskey"
 	"go-admin/common/global"
 	"go-admin/common/helper"
 	"go-admin/config/serverinit"
 	models2 "go-admin/models"
 	"go-admin/pkg/utility"
 	"go-admin/services/binanceservice"
-	"go-admin/services/cacheservice"
 	"strings"
 
 	"github.com/bytedance/sonic"
@@ -289,8 +289,9 @@ func (e LineSymbol) SyncSpotSymbol(c *gin.Context) {
 		Symbol string `json:"symbol"`
 		Price  string `json:"price"`
 	}
-
-	tickerSymbolMaps, _ := cacheservice.GetExchangeTradeSets(global.EXCHANGE_BINANCE, 1)
+	tickerSymbol := helper.DefaultRedis.Get(rediskey.SpotSymbolTicker).Val()
+	tickerSymbolMaps := make([]Ticker, 0)
+	sonic.Unmarshal([]byte(tickerSymbol), &tickerSymbolMaps)
 
 	for symbol, tradeSet := range tradeSets {
 		var lineSymbol models.LineSymbol
@@ -319,10 +320,11 @@ func (e LineSymbol) SyncSpotSymbol(c *gin.Context) {
 				continue
 			}
 		} else {
+
 			var tickerPrice decimal.Decimal
 			for _, symbolMap := range tickerSymbolMaps {
 				if symbolMap.Symbol == strings.ToUpper(spotTicker24h.Currency+"USDT") {
-					tickerPrice, _ = decimal.NewFromString(symbolMap.LastPrice)
+					tickerPrice, _ = decimal.NewFromString(symbolMap.Price)
 				}
 			}
 			if tickerPrice.GreaterThan(decimal.Zero) {
@@ -410,8 +412,10 @@ func (e LineSymbol) SyncFutSymbol(c *gin.Context) {
 		Symbol string `json:"symbol"`
 		Price  string `json:"price"`
 	}
+	tickerSymbol := helper.DefaultRedis.Get(rediskey.FutSymbolTicker).Val()
+	tickerSymbolMaps := make([]Ticker, 0)
+	sonic.Unmarshal([]byte(tickerSymbol), &tickerSymbolMaps)
 
-	tickerSymbolMaps, _ := cacheservice.GetExchangeTradeSets(global.EXCHANGE_BINANCE, 2)
 	e.Orm.Model(&models.LineSymbolBlack{}).Where("type = 1").Find(&symbolBlack)
 	for symbol, tradeSet := range tradeSets {
 		var lineSymbol models.LineSymbol
@@ -443,7 +447,7 @@ func (e LineSymbol) SyncFutSymbol(c *gin.Context) {
 			var tickerPrice decimal.Decimal
 			for _, symbolMap := range tickerSymbolMaps {
 				if symbolMap.Symbol == strings.ToUpper(spotTicker24h.Currency+"USDT") {
-					tickerPrice, _ = decimal.NewFromString(symbolMap.LastPrice)
+					tickerPrice, _ = decimal.NewFromString(symbolMap.Price)
 				}
 			}
 			if tickerPrice.GreaterThan(decimal.Zero) {

app/admin/fronted/line_user.go

@@ -10,7 +10,8 @@ import (
 	"go-admin/app/admin/service/appservice"
 	"go-admin/app/admin/service/common"
 	"go-admin/app/admin/service/dto"
-	"go-admin/common/global"
+	"go-admin/common/const/rediskey"
+	"go-admin/common/helper"
 	"go-admin/common/service/sysservice/authservice"
 	"go-admin/common/service/sysservice/sysstatuscode"
 	statuscode "go-admin/common/status_code"
@@ -18,7 +19,7 @@ import (
 	"go-admin/models/coingatedto"
 	"go-admin/pkg/cryptohelper/inttostring"
 	"go-admin/pkg/utility"
-	"go-admin/services/cacheservice"
+	"go-admin/services/binanceservice"
 	"go-admin/services/udunservice"
 
 	"github.com/bytedance/sonic"
@@ -372,15 +373,20 @@ func (e LineUserApi) Info(c *gin.Context) {
 		e.Logger.Error(500, err, err.Error())
 		return
 	}
-
-	tickerData, _ := cacheservice.GetExchangeTradeSets(global.EXCHANGE_BINANCE, 1)
+	//用户u的余额
+	var tickerData []binanceservice.Ticker
+	val := helper.DefaultRedis.Get(rediskey.SpotSymbolTicker).Val()
+	if val != "" {
+		sonic.Unmarshal([]byte(val), &tickerData)
+	}
+	// var usdtBalance decimal.Decimal
 	for i, asset := range resp {
 		symbol := asset.Asset + "USDT"
 		for _, datum := range tickerData {
 			if datum.Symbol == symbol {
 				// mul := utility.StringToDecimal(datum.Price).Mul(utility.StringToDecimal(asset.Free))
 				// usdtBalance = usdtBalance.Add(mul)
-				resp[i].UsdtValuation = datum.LastPrice
+				resp[i].UsdtValuation = datum.Price
 			}
 		}
 	}

app/admin/models/line_api_user.go

@@ -2,30 +2,31 @@ package models
 
 import (
 	"go-admin/common/models"
+
+	"github.com/shopspring/decimal"
 )
 
 type LineApiUser struct {
 	models.Model
 
-	ExchangeType string `json:"exchangeType" gorm:"type:varchar(20);comment:交易所类型(字典 exchange_type)"`
-	UserId       int64  `json:"userId" gorm:"type:int unsigned;comment:用户id"`
-	JysId        int64  `json:"jysId" gorm:"type:int;comment:关联交易所账号id"`
-	ApiName      string `json:"apiName" gorm:"type:varchar(255);comment:api用户名"`
-	ApiKey       string `json:"apiKey" gorm:"type:varchar(255);comment:apiKey"`
-	ApiSecret    string `json:"apiSecret" gorm:"type:varchar(255);comment:apiSecret"`
-	Passphrase   string `json:"passphrase" gorm:"type:varchar(255);comment:api密码"`
-	IpAddress    string `json:"ipAddress" gorm:"type:varchar(255);comment:代理地址"`
-	UserPass     string `json:"userPass" gorm:"type:varchar(255);comment:代码账号密码"`
-	AdminId      int64  `json:"adminId" gorm:"type:int unsigned;comment:管理员id"`
-	Affiliation  int64  `json:"affiliation" gorm:"type:int;comment:归属:1=现货,2=合约,3=现货合约"`
-	AdminShow    int64  `json:"adminShow" gorm:"type:int;comment:是否超管可见:1=是,0=否"`
-	Site         string `json:"site" gorm:"type:enum('1','2','3');comment:允许下单的方向:1=多;2=空;3=多空"`
-	Subordinate  string `json:"subordinate" gorm:"type:enum('0','1','2');comment:从属关系:0=未绑定关系;1=主账号;2=副帐号"`
-	GroupId      int64  `json:"groupId" gorm:"type:int unsigned;comment:所属组id"`
-	OpenStatus   int64  `json:"openStatus" gorm:"type:int unsigned;comment:开启状态 0=关闭 1=开启"`
-
-	SpotLastTime    string `json:"spotLastTime" gorm:"-"`    //现货websocket最后通信时间
-	FuturesLastTime string `json:"futuresLastTime" gorm:"-"` //合约websocket最后通信时间
+	ExchangeType    string          `json:"exchangeType" gorm:"type:varchar(20);comment:交易所类型(字典 exchange_type)"`
+	UserId          int64           `json:"userId" gorm:"type:int unsigned;comment:用户id"`
+	ApiName         string          `json:"apiName" gorm:"type:varchar(255);comment:api用户名"`
+	ApiKey          string          `json:"apiKey" gorm:"type:varchar(255);comment:apiKey"`
+	ApiSecret       string          `json:"apiSecret" gorm:"type:varchar(255);comment:apiSecret"`
+	IpAddress       string          `json:"ipAddress" gorm:"type:varchar(255);comment:代理地址"`
+	UserPass        string          `json:"userPass" gorm:"type:varchar(255);comment:代码账号密码"`
+	Affiliation     int64           `json:"affiliation" gorm:"type:int;comment:归属:1=现货,2=合约,3=现货合约"`
+	AdminShow       int64           `json:"adminShow" gorm:"type:int;comment:是否超管可见:1=是,0=否"`
+	Site            string          `json:"site" gorm:"type:enum('1','2','3');comment:允许下单的方向:1=多;2=空;3=多空"`
+	Subordinate     string          `json:"subordinate" gorm:"type:enum('0','1','2');comment:从属关系:0=未绑定关系;1=主账号;2=副帐号"`
+	GroupId         int64           `json:"groupId" gorm:"type:int unsigned;comment:所属组id"`
+	OpenStatus      int64           `json:"openStatus" gorm:"type:int unsigned;comment:开启状态 0=关闭 1=开启"`
+	ReverseStatus   int             `json:"reverseStatus" gorm:"type:tinyint unsigned;comment:反向开仓:1=开启;2=关闭"`
+	ReverseApiId    int             `json:"reverseApiId" gorm:"type:bigint;comment:反向apiId"`
+	OrderProportion decimal.Decimal `json:"orderProportion" gorm:"type:decimal(10,2);comment:委托比例"`
+	SpotLastTime    string          `json:"spotLastTime" gorm:"-"`    //现货websocket最后通信时间
+	FuturesLastTime string          `json:"futuresLastTime" gorm:"-"` //合约websocket最后通信时间
 	models.ModelTime
 	models.ControlBy
 }

app/admin/models/line_reverse_order.go

@@ -0,0 +1,52 @@
+package models
+
+import (
+	"time"
+
+	"go-admin/common/models"
+
+	"github.com/shopspring/decimal"
+)
+
+type LineReverseOrder struct {
+	models.Model
+
+	PositionId int `json:"positionId" gorm:"type:bigint;comment:仓位id"`
+	ApiId      int `json:"apiId" gorm:"type:bigint;comment:api id"`
+	Category   int `json:"category" gorm:"type:tinyint;comment:分类 0-原始订单 1-反单"`
+
+	OrderSn       string          `json:"orderSn" gorm:"type:varchar(50);comment:订单号 0-主单 1-止盈 2-止损"`
+	OrderId       string          `json:"orderId" gorm:"type:varchar(50);comment:币安订单号"`
+	FollowOrderSn string          `json:"followOrderSn" gorm:"type:varchar(50);comment:跟随币安订单号"`
+	Symbol        string          `json:"symbol" gorm:"type:varchar(20);comment:交易对"`
+	Type          string          `json:"type" gorm:"type:varchar(20);comment:交易类型"`
+	OrderType     int             `json:"orderType" gorm:"type:tinyint;comment:订单类型 0-主单 1-止盈  2-止损 3-减仓单 4-平仓单"`
+	BuyPrice      decimal.Decimal `json:"buyPrice" gorm:"type:decimal(18,8);comment:购买金额"`
+	Price         decimal.Decimal `json:"price" gorm:"type:decimal(18,8);comment:委托价格"`
+	TotalNum      decimal.Decimal `json:"totalNum" gorm:"type:decimal(18,8);comment:总成交数量"`
+	PriceU        decimal.Decimal `json:"priceU" gorm:"type:decimal(18,8);comment:委托价格(U)"`
+	FinalPrice    decimal.Decimal `json:"finalPrice" gorm:"type:decimal(18,8);comment:实际成交价"`
+	PositionSide  string          `json:"positionSide" gorm:"type:varchar(10);comment:持仓方向 LONG-多 SHORT-空"`
+	Side          string          `json:"side" gorm:"type:varchar(10);comment:买卖方向 SELL-卖 BUY-买"`
+	SignPrice     decimal.Decimal `json:"signPrice" gorm:"type:decimal(18,8);comment:行情价"`
+	TriggerTime   *time.Time      `json:"triggerTime" gorm:"type:datetime;comment:触发时间"`
+	Status        int             `json:"status" gorm:"type:tinyint;comment:状态 1-待下单 2-已下单 3-已成交 6-已取消 7-已过期 8-已失败"`
+	IsAddPosition int             `json:"isAddPosition" gorm:"type:tinyint;comment:是否增加仓位 1-否 2-是"`
+	IsReduce      int             `json:"isReduce" gorm:"type:tinyint;comment:是否减少仓位 1-否 2-是"`
+	Remark        string          `json:"remark" gorm:"type:varchar(255);comment:备注"`
+	models.ModelTime
+	models.ControlBy
+}
+
+func (LineReverseOrder) TableName() string {
+	return "line_reverse_order"
+}
+
+func (e *LineReverseOrder) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *LineReverseOrder) GetId() interface{} {
+	return e.Id
+}

app/admin/models/line_reverse_position.go

@@ -0,0 +1,41 @@
+package models
+
+import (
+	"go-admin/common/models"
+
+	"github.com/shopspring/decimal"
+)
+
+type LineReversePosition struct {
+	models.Model
+
+	PositionNo          string          `json:"positionNo" gorm:"type:varchar(18);comment:仓位编号"`
+	ApiId               int             `json:"apiId" gorm:"type:bigint;comment:api_id"`
+	TotalAmount         decimal.Decimal `json:"totalAmount" gorm:"type:decimal(18,8);comment:总仓位"`
+	Amount              decimal.Decimal `json:"amount" gorm:"type:decimal(18,8);comment:仓位"`
+	ReverseApiId        int             `json:"reverseApiId" gorm:"type:bigint;comment:反单api_id"`
+	TotalReverseAmount  decimal.Decimal `json:"totalReverseAmount" gorm:"type:decimal(18,8);comment:总反单仓位"`
+	ReverseAmount       decimal.Decimal `json:"reverseAmount" gorm:"type:decimal(18,8);comment:反单仓位"`
+	Side                string          `json:"side" gorm:"type:varchar(10);comment:买卖方向 BUY SELL"`
+	PositionSide        string          `json:"positionSide" gorm:"type:varchar(10);comment:持仓方向 LONG SHORT"`
+	Symbol              string          `json:"symbol" gorm:"type:varchar(20);comment:交易对"`
+	Status              int             `json:"status" gorm:"type:tinyint;comment:仓位状态 1-已开仓 2-已平仓"`
+	ReverseStatus       int             `json:"reverseStatus" gorm:"type:tinyint;comment:反单仓位状态 1-已开仓 2-已平仓"`
+	AveragePrice        decimal.Decimal `json:"averagePrice" gorm:"type:decimal(18,8);comment:主单平均价格"`
+	ReverseAveragePrice decimal.Decimal `json:"reverseAveragePrice" gorm:"type:decimal(18,8);comment:反单平均价格"`
+	models.ModelTime
+	models.ControlBy
+}
+
+func (LineReversePosition) TableName() string {
+	return "line_reverse_position"
+}
+
+func (e *LineReversePosition) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *LineReversePosition) GetId() interface{} {
+	return e.Id
+}

app/admin/models/line_reverse_setting.go

@@ -0,0 +1,31 @@
+package models
+
+import (
+	"go-admin/common/models"
+
+	"github.com/shopspring/decimal"
+)
+
+type LineReverseSetting struct {
+	models.Model
+
+	ReverseOrderType    string          `json:"reverseOrderType" redis:"reverseOrderType" gorm:"type:varchar(10);comment:反单下单类型 LIMIT-限价 MARKET-市价"`
+	ReversePremiumRatio decimal.Decimal `json:"reversePremiumRatio" redis:"reversePremiumRatio" gorm:"type:decimal(10,2);comment:溢价百分比"`
+	TakeProfitRatio     decimal.Decimal `json:"takeProfitRatio" redis:"takeProfitRatio" gorm:"type:decimal(10,2);comment:止盈百分比"`
+	StopLossRatio       decimal.Decimal `json:"stopLossRatio" redis:"stopLossRatio" gorm:"type:decimal(10,2);comment:止损百分比"`
+	models.ModelTime
+	models.ControlBy
+}
+
+func (LineReverseSetting) TableName() string {
+	return "line_reverse_setting"
+}
+
+func (e *LineReverseSetting) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *LineReverseSetting) GetId() interface{} {
+	return e.Id
+}

app/admin/models/line_strategy_template.go

@@ -14,7 +14,7 @@ type LineStrategyTemplate struct {
 	Percentag     decimal.Decimal `json:"percentag" gorm:"type:decimal(10,2);comment:涨跌点数"`
 	CompareType   int             `json:"compareType" gorm:"type:tinyint;comment:比较类型 1-大于 2-大于等于 3-小于 4-小于等于 5等于 "`
 	TimeSlotStart int             `json:"timeSlotStart" gorm:"type:int;comment:时间段开始(分)"`
-	TimeSlotEnd   int             `json:"timeSlotEnd" gorm:"type:int;comment:时间断截至(分)"`
+	// TimeSlotEnd   int             `json:"timeSlotEnd" gorm:"type:int;comment:时间断截至(分)"`
 	models.ModelTime
 	models.ControlBy
 }

app/admin/router/line_api_user.go

@@ -27,5 +27,11 @@ func registerLineApiUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMi
 		r.POST("bind", api.Bind)               //绑定从属关系
 		r.POST("getUser", api.GetUser)         //获取未绑定的用户
 		r.POST("getMainUser", api.GetMainUser) //获取获取主账号的用户
+
+		r.GET("unbind-reverse", api.GetUnBindReverseApiUser) //获取未绑定下反单用户
+
+		r.GET("reverse-options", api.GetReverseApiOptions) //获取可用反单api用户
+
+		r.GET("reverse-options-all", api.GetReverseApiOptionsAll) //获取全部启用的反单api用户
 	}
 }

app/admin/router/line_reverse_order.go

@@ -0,0 +1,27 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+
+	"go-admin/app/admin/apis"
+	"go-admin/common/middleware"
+	"go-admin/common/actions"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerLineReverseOrderRouter)
+}
+
+// registerLineReverseOrderRouter
+func registerLineReverseOrderRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	api := apis.LineReverseOrder{}
+	r := v1.Group("/line-reverse-order").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	{
+		r.GET("", actions.PermissionAction(), api.GetPage)
+		r.GET("/:id", actions.PermissionAction(), api.Get)
+		r.POST("", api.Insert)
+		r.PUT("/:id", actions.PermissionAction(), api.Update)
+		r.DELETE("", api.Delete)
+	}
+}

app/admin/router/line_reverse_position.go

@@ -0,0 +1,30 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+
+	"go-admin/app/admin/apis"
+	"go-admin/common/actions"
+	"go-admin/common/middleware"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerLineReversePositionRouter)
+}
+
+// registerLineReversePositionRouter
+func registerLineReversePositionRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	api := apis.LineReversePosition{}
+	r := v1.Group("/line-reverse-position").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	{
+		r.GET("", actions.PermissionAction(), api.GetPage)
+		r.GET("/:id", actions.PermissionAction(), api.Get)
+		r.POST("", api.Insert)
+		r.PUT("/:id", actions.PermissionAction(), api.Update)
+		r.DELETE("", api.Delete)
+
+		r.PUT("close/:id", actions.PermissionAction(), api.ClosePosition)
+		r.PUT("close-batch", actions.PermissionAction(), api.ClosePositionBatch)
+	}
+}

app/admin/router/line_reverse_setting.go

@@ -0,0 +1,27 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+
+	"go-admin/app/admin/apis"
+	"go-admin/common/actions"
+	"go-admin/common/middleware"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerLineReverseSettingRouter)
+}
+
+// registerLineReverseSettingRouter
+func registerLineReverseSettingRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	api := apis.LineReverseSetting{}
+	r := v1.Group("/line-reverse-setting").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	{
+		r.GET("", actions.PermissionAction(), api.GetPage)
+		r.GET("/:id", actions.PermissionAction(), api.Get)
+		r.POST("", api.Insert)
+		r.PUT("/:id", actions.PermissionAction(), api.Update)
+		// r.DELETE("", api.Delete)
+	}
+}

app/admin/service/dto/line_api_user.go

@@ -1,9 +1,12 @@
 package dto
 
 import (
+	"errors"
 	"go-admin/app/admin/models"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
+
+	"github.com/shopspring/decimal"
 )
 
 type LineApiUserGetPageReq struct {
@@ -41,44 +44,66 @@ func (m *LineApiUserGetPageReq) GetNeedSearch() interface{} {
 }
 
 type LineApiUserInsertReq struct {
-	Id           int    `json:"-" comment:"id"` // id
-	ExchangeType string `json:"exchangeType" comment:"交易所code"`
-	UserId       int64  `json:"userId" comment:"用户id"`
-	JysId        int64  `json:"jysId" comment:"关联交易所账号id"`
-	ApiName      string `json:"apiName" comment:"api用户名"`
-	ApiKey       string `json:"apiKey" comment:"apiKey"`
-	ApiSecret    string `json:"apiSecret" comment:"apiSecret"`
-	IpAddress    string `json:"ipAddress" comment:"代理地址"`
-	UserPass     string `json:"userPass" comment:"代码账号密码"`
-	AdminId      int64  `json:"adminId" comment:"管理员id"`
-	Affiliation  int64  `json:"affiliation" comment:"归属:1=现货,2=合约,3=现货合约"`
-	AdminShow    int64  `json:"adminShow" comment:"是否超管可见:1=是,0=否"`
-	Site         string `json:"site" comment:"允许下单的方向:1=多;2=空;3=多空"`
-	Subordinate  string `json:"subordinate" comment:"从属关系:0=未绑定关系;1=主账号;2=副帐号"`
-	GroupId      int64  `json:"groupId" comment:"所属组id"`
-	OpenStatus   int64  `json:"openStatus" comment:"开启状态 0=关闭 1=开启"`
+	Id              int             `json:"-" comment:"id"` // id
+	ExchangeType    string          `json:"exchangeType" comment:"交易所code"`
+	UserId          int64           `json:"userId" comment:"用户id"`
+	JysId           int64           `json:"jysId" comment:"关联交易所账号id"`
+	ApiName         string          `json:"apiName" comment:"api用户名"`
+	ApiKey          string          `json:"apiKey" comment:"apiKey"`
+	ApiSecret       string          `json:"apiSecret" comment:"apiSecret"`
+	IpAddress       string          `json:"ipAddress" comment:"代理地址"`
+	UserPass        string          `json:"userPass" comment:"代码账号密码"`
+	Affiliation     int64           `json:"affiliation" comment:"归属:1=现货,2=合约,3=现货合约"`
+	AdminShow       int64           `json:"adminShow" comment:"是否超管可见:1=是,0=否"`
+	Site            string          `json:"site" comment:"允许下单的方向:1=多;2=空;3=多空"`
+	Subordinate     string          `json:"subordinate" comment:"从属关系:0=未绑定关系;1=主账号;2=副帐号"`
+	GroupId         int64           `json:"groupId" comment:"所属组id"`
+	OpenStatus      int64           `json:"openStatus" comment:"开启状态 0=关闭 1=开启"`
+	ReverseStatus   int             `json:"reverseStatus" comment:"反向下单状态 1-开启 2-关闭"`
+	ReverseApiId    int             `json:"reverseApiId" comment:"反向下单apiId"`
+	OrderProportion decimal.Decimal `json:"orderProportion" comment:"委托比例"`
 	common.ControlBy
 }
 
+func (s *LineApiUserInsertReq) Valid() error {
+	if s.ReverseStatus == 1 {
+		if s.OrderProportion.Cmp(decimal.Zero) <= 0 {
+			return errors.New("委托比例必须大于0")
+		}
+
+		if s.ReverseStatus == 1 && s.ReverseApiId == 0 {
+			return errors.New("反向下单api不能为空")
+		}
+	}
+	return nil
+}
+
 func (s *LineApiUserInsertReq) Generate(model *models.LineApiUser) {
 	if s.Id == 0 {
 		model.Model = common.Model{Id: s.Id}
 	}
 	model.ExchangeType = s.ExchangeType
 	model.UserId = s.UserId
-	model.JysId = s.JysId
 	model.ApiName = s.ApiName
 	model.ApiKey = s.ApiKey
 	model.ApiSecret = s.ApiSecret
 	model.IpAddress = s.IpAddress
 	model.UserPass = s.UserPass
-	model.AdminId = s.AdminId
 	model.Affiliation = s.Affiliation
 	model.AdminShow = s.AdminShow
 	model.Site = s.Site
 	model.Subordinate = s.Subordinate
 	model.GroupId = s.GroupId
 	model.OpenStatus = s.OpenStatus
+	model.ReverseStatus = s.ReverseStatus
+	model.OrderProportion = s.OrderProportion
+
+	if model.ReverseStatus == 1 {
+		model.ReverseApiId = s.ReverseApiId
+	} else {
+		model.ReverseApiId = 0
+	}
+
 	model.CreateBy = s.CreateBy // 添加这而，需要记录是被谁创建的
 }
 
@@ -87,44 +112,66 @@ func (s *LineApiUserInsertReq) GetId() interface{} {
 }
 
 type LineApiUserUpdateReq struct {
-	Id           int    `uri:"id" comment:"id"` // id
-	ExchangeType string `json:"exchangeType" comment:"交易所code"`
-	UserId       int64  `json:"userId" comment:"用户id"`
-	JysId        int64  `json:"jysId" comment:"关联交易所账号id"`
-	ApiName      string `json:"apiName" comment:"api用户名"`
-	ApiKey       string `json:"apiKey" comment:"apiKey"`
-	ApiSecret    string `json:"apiSecret" comment:"apiSecret"`
-	IpAddress    string `json:"ipAddress" comment:"代理地址"`
-	UserPass     string `json:"userPass" comment:"代码账号密码"`
-	AdminId      int64  `json:"adminId" comment:"管理员id"`
-	Affiliation  int64  `json:"affiliation" comment:"归属:1=现货,2=合约,3=现货合约"`
-	AdminShow    int64  `json:"adminShow" comment:"是否超管可见:1=是,0=否"`
-	Site         string `json:"site" comment:"允许下单的方向:1=多;2=空;3=多空"`
-	Subordinate  string `json:"subordinate" comment:"从属关系:0=未绑定关系;1=主账号;2=副帐号"`
-	GroupId      int64  `json:"groupId" comment:"所属组id"`
-	OpenStatus   int64  `json:"openStatus" comment:"开启状态 0=关闭 1=开启"`
+	Id              int             `uri:"id" comment:"id"` // id
+	ExchangeType    string          `json:"exchangeType" comment:"交易所code"`
+	UserId          int64           `json:"userId" comment:"用户id"`
+	JysId           int64           `json:"jysId" comment:"关联交易所账号id"`
+	ApiName         string          `json:"apiName" comment:"api用户名"`
+	ApiKey          string          `json:"apiKey" comment:"apiKey"`
+	ApiSecret       string          `json:"apiSecret" comment:"apiSecret"`
+	IpAddress       string          `json:"ipAddress" comment:"代理地址"`
+	UserPass        string          `json:"userPass" comment:"代码账号密码"`
+	Affiliation     int64           `json:"affiliation" comment:"归属:1=现货,2=合约,3=现货合约"`
+	AdminShow       int64           `json:"adminShow" comment:"是否超管可见:1=是,0=否"`
+	Site            string          `json:"site" comment:"允许下单的方向:1=多;2=空;3=多空"`
+	Subordinate     string          `json:"subordinate" comment:"从属关系:0=未绑定关系;1=主账号;2=副帐号"`
+	GroupId         int64           `json:"groupId" comment:"所属组id"`
+	OpenStatus      int64           `json:"openStatus" comment:"开启状态 0=关闭 1=开启"`
+	ReverseStatus   int             `json:"reverseStatus" comment:"反向下单状态 1-开启 2-关闭"`
+	ReverseApiId    int             `json:"reverseApiId" comment:"反向下单apiId"`
+	OrderProportion decimal.Decimal `json:"orderProportion" comment:"委托比例"`
 	common.ControlBy
 }
 
+func (s *LineApiUserUpdateReq) Valid() error {
+	if s.ReverseStatus == 1 {
+		if s.OrderProportion.Cmp(decimal.Zero) <= 0 {
+			return errors.New("委托比例必须大于0")
+		}
+
+		if s.ReverseStatus == 1 && s.ReverseApiId == 0 {
+			return errors.New("反向下单api不能为空")
+		}
+	}
+	return nil
+}
+
 func (s *LineApiUserUpdateReq) Generate(model *models.LineApiUser) {
 	if s.Id == 0 {
 		model.Model = common.Model{Id: s.Id}
 	}
 	model.ExchangeType = s.ExchangeType
 	model.UserId = s.UserId
-	model.JysId = s.JysId
 	model.ApiName = s.ApiName
 	model.ApiKey = s.ApiKey
 	model.ApiSecret = s.ApiSecret
 	model.IpAddress = s.IpAddress
 	model.UserPass = s.UserPass
-	model.AdminId = s.AdminId
 	model.Affiliation = s.Affiliation
 	model.AdminShow = s.AdminShow
 	model.Site = s.Site
 	model.Subordinate = s.Subordinate
 	model.GroupId = s.GroupId
 	model.OpenStatus = s.OpenStatus
+	model.ReverseStatus = s.ReverseStatus
+	model.OrderProportion = s.OrderProportion
+
+	if model.ReverseStatus == 1 {
+		model.ReverseApiId = s.ReverseApiId
+	} else {
+		model.ReverseApiId = 0
+	}
+
 	model.UpdateBy = s.UpdateBy // 添加这而，需要记录是被谁更新的
 }
 
@@ -159,3 +206,26 @@ type LineApiUserBindSubordinateReq struct {
 type GetMainUserReq struct {
 	ExchangeType string `json:"exchangeType"`
 }
+
+type GetUnBindReverseReq struct {
+	ExchangeType string `json:"exchangeType" form:"exchangeType"`
+	ApiId        int    `json:"apiId" form:"apiId" comment:"当前apiId"`
+}
+
+// 未绑定反向下单查询返回结构体
+type UnBindReverseResp struct {
+	Id       int    `json:"id"`
+	UserId   int64  `json:"userId"`
+	Disabled bool   `json:"disabled"`
+	ApiName  string `json:"apiName"`
+}
+
+type GetReverseApiOptionsReq struct {
+	Id    int `json:"apiId" form:"id"`
+	ApiId int `json:"apiId" form:"apiId"`
+}
+
+type LineApiUserOptionResp struct {
+	Id   int    `json:"id"`
+	Name string `json:"name"`
+}

app/admin/service/dto/line_pre_order.go

@@ -197,7 +197,7 @@ type LineAddPreOrderReq struct {
 	Site                    string          `json:"site" `                       //购买方向
 	BuyPrice                string          `json:"buy_price" vd:"$>0"`          //购买金额 U
 	PricePattern            string          `json:"price_pattern"`               //价格模式
-	Price                   string          `json:"price" vd:"$>0"`              //下单价百分比
+	Price                   string          `json:"price"`                       //下单价百分比
 	Profit                  string          `json:"profit" vd:"$>0"`             //止盈价
 	ProfitNumRatio          decimal.Decimal `json:"profit_num_ratio"`            //止盈数量百分比
 	ProfitTpTpPriceRatio    decimal.Decimal `json:"profit_tp_tp_price_ratio"`    //止盈后止盈价百分比
@@ -295,7 +295,7 @@ func (req LineAddPreOrderReq) Valid() error {
 		return errors.New("主单减仓数量百分比不能为空")
 	}
 
-	if req.ReducePriceRatio.IsZero() || req.ReducePriceRatio.Cmp(decimal.NewFromInt(100)) >= 0 {
+	if req.PricePattern != "mixture" && (req.ReducePriceRatio.IsZero() || req.ReducePriceRatio.Cmp(decimal.NewFromInt(100)) >= 0) {
 		return errors.New("主单减仓价格百分比错误")
 	}
 
@@ -447,7 +447,7 @@ func (req LineBatchAddPreOrderReq) CheckParams() error {
 		return errors.New("主单减仓数量百分比不能为空")
 	}
 
-	if req.ReducePriceRatio.Cmp(decimal.Zero) <= 0 || req.ReducePriceRatio.Cmp(decimal.NewFromInt(100)) >= 0 {
+	if req.PricePattern != "mixture" && (req.ReducePriceRatio.Cmp(decimal.Zero) <= 0 || req.ReducePriceRatio.Cmp(decimal.NewFromInt(100)) >= 0) {
 		return errors.New("主单减仓价格百分比错误")
 	}
 

app/admin/service/dto/line_reduce_strategy_item.go

@@ -51,7 +51,7 @@ func (s *LineReduceStrategyItem) Valid() error {
 		return errors.New("百分比不能小于等于0")
 	}
 
-	if s.QuantityPercent.Cmp(decimal.NewFromInt(100)) > 0 {
+	if s.QuantityPercent.Cmp(decimal.NewFromInt(100)) >= 0 {
 		return errors.New("数量百分比不能大于等于100")
 	}
 

app/admin/service/dto/line_reverse_order.go

@@ -0,0 +1,162 @@
+package dto
+
+import (
+	"time"
+
+	"go-admin/app/admin/models"
+	"go-admin/common/dto"
+	common "go-admin/common/models"
+
+	"github.com/shopspring/decimal"
+)
+
+type LineReverseOrderGetPageReq struct {
+	dto.Pagination `search:"-"`
+	OrderSn        string `form:"orderSn"  search:"type:contains;column:order_sn;table:line_reverse_order" comment:"订单号"`
+	OrderId        string `form:"orderId"  search:"type:contains;column:order_id;table:line_reverse_order" comment:"币安订单号"`
+	FollowOrderSn  string `form:"followOrderSn"  search:"type:contains;column:follow_order_sn;table:line_reverse_order" comment:"跟随币安订单号"`
+	OrderType      int    `form:"orderType"  search:"type:exact;column:order_type;table:line_reverse_order" comment:"订单类型 0-主单 1-止损单 2-加仓 3-减仓"`
+	PositionSide   string `form:"positionSide"  search:"type:exact;column:position_side;table:line_reverse_order" comment:"持仓方向 LONG-多 SHORT-空"`
+	Side           string `form:"side"  search:"type:exact;column:side;table:line_reverse_order" comment:"买卖方向 SELL-卖 BUY-买"`
+	Type           string `form:"type"  search:"type:exact;column:type;table:line_reverse_order" comment:"类型 LIMIT-限价 MARKET-市价 "`
+	Category       int    `form:"category" search:"-" comment:"类型 0-主单 1-反单"`
+	Status         int    `form:"status"  search:"type:exact;column:status;table:line_reverse_order" comment:"状态 1-待下单 2-已下单 3-已成交 4-已平仓 5-已止损"`
+	PositionId     int    `form:"positionId" search:"type:exact;column:position_id;table:line_reverse_order" comment:"持仓id"`
+	LineReverseOrderOrder
+}
+
+type LineReverseOrderOrder struct {
+	Id            string `form:"idOrder"  search:"type:order;column:id;table:line_reverse_order"`
+	PId           string `form:"pIdOrder"  search:"type:order;column:p_id;table:line_reverse_order"`
+	OrderSn       string `form:"orderSnOrder"  search:"type:order;column:order_sn;table:line_reverse_order"`
+	OrderId       string `form:"orderIdOrder"  search:"type:order;column:order_id;table:line_reverse_order"`
+	FollowOrderSn string `form:"followOrderSnOrder"  search:"type:order;column:follow_order_sn;table:line_reverse_order"`
+	Symbol        string `form:"symbolOrder"  search:"type:order;column:symbol;table:line_reverse_order"`
+	OrderType     string `form:"orderTypeOrder"  search:"type:order;column:order_type;table:line_reverse_order"`
+	BuyPrice      string `form:"buyPriceOrder"  search:"type:order;column:buy_price;table:line_reverse_order"`
+	Price         string `form:"priceOrder"  search:"type:order;column:price;table:line_reverse_order"`
+	PriceU        string `form:"priceUOrder"  search:"type:order;column:price_u;table:line_reverse_order"`
+	FinalPrice    string `form:"finalPriceOrder"  search:"type:order;column:final_price;table:line_reverse_order"`
+	PositionSide  string `form:"positionSideOrder"  search:"type:order;column:position_side;table:line_reverse_order"`
+	Side          string `form:"sideOrder"  search:"type:order;column:side;table:line_reverse_order"`
+	SignPrice     string `form:"signPriceOrder"  search:"type:order;column:sign_price;table:line_reverse_order"`
+	TriggerTime   string `form:"triggerTimeOrder"  search:"type:order;column:trigger_time;table:line_reverse_order"`
+	Status        string `form:"statusOrder"  search:"type:order;column:status;table:line_reverse_order"`
+	CreatedAt     string `form:"createdAtOrder"  search:"type:order;column:created_at;table:line_reverse_order"`
+	UpdatedAt     string `form:"updatedAtOrder"  search:"type:order;column:updated_at;table:line_reverse_order"`
+	DeletedAt     string `form:"deletedAtOrder"  search:"type:order;column:deleted_at;table:line_reverse_order"`
+	CreateBy      string `form:"createByOrder"  search:"type:order;column:create_by;table:line_reverse_order"`
+	UpdateBy      string `form:"updateByOrder"  search:"type:order;column:update_by;table:line_reverse_order"`
+}
+
+func (m *LineReverseOrderGetPageReq) GetNeedSearch() interface{} {
+	return *m
+}
+
+type LineReverseOrderInsertReq struct {
+	Id            int             `json:"-" comment:"主键id"` // 主键id
+	PositionId    int             `json:"positionId" comment:"仓位id"`
+	OrderSn       string          `json:"orderSn" comment:"订单号"`
+	OrderId       string          `json:"orderId" comment:"币安订单号"`
+	FollowOrderSn string          `json:"followOrderSn" comment:"跟随币安订单号"`
+	Symbol        string          `json:"symbol" comment:"交易对"`
+	OrderType     int             `json:"orderType" comment:"订单类型 0-主单 1-止损单 2-加仓 3-减仓"`
+	BuyPrice      decimal.Decimal `json:"buyPrice" comment:"购买金额"`
+	Price         decimal.Decimal `json:"price" comment:"委托价格"`
+	PriceU        decimal.Decimal `json:"priceU" comment:"委托价格(U)"`
+	FinalPrice    decimal.Decimal `json:"finalPrice" comment:"实际成交价"`
+	PositionSide  string          `json:"positionSide" comment:"持仓方向 LONG-多 SHORT-空"`
+	Side          string          `json:"side" comment:"买卖方向 SELL-卖 BUY-买"`
+	SignPrice     decimal.Decimal `json:"signPrice" comment:"行情价"`
+	TriggerTime   time.Time       `json:"triggerTime" comment:"触发时间"`
+	Status        int             `json:"status" comment:"状态 1-待下单 2-已下单 3-已成交 4-已平仓 5-已止损"`
+	common.ControlBy
+}
+
+func (s *LineReverseOrderInsertReq) Generate(model *models.LineReverseOrder) {
+	if s.Id == 0 {
+		model.Model = common.Model{Id: s.Id}
+	}
+	model.OrderSn = s.OrderSn
+	model.OrderId = s.OrderId
+	model.FollowOrderSn = s.FollowOrderSn
+	model.Symbol = s.Symbol
+	model.OrderType = s.OrderType
+	model.BuyPrice = s.BuyPrice
+	model.Price = s.Price
+	model.PriceU = s.PriceU
+	model.FinalPrice = s.FinalPrice
+	model.PositionSide = s.PositionSide
+	model.Side = s.Side
+	model.SignPrice = s.SignPrice
+	model.TriggerTime = &s.TriggerTime
+	model.Status = s.Status
+	model.CreateBy = s.CreateBy // 添加这而，需要记录是被谁创建的
+}
+
+func (s *LineReverseOrderInsertReq) GetId() interface{} {
+	return s.Id
+}
+
+type LineReverseOrderUpdateReq struct {
+	Id            int             `uri:"id" comment:"主键id"` // 主键id
+	PositionId    int             `json:"positionId" comment:"仓位id"`
+	OrderSn       string          `json:"orderSn" comment:"订单号"`
+	OrderId       string          `json:"orderId" comment:"币安订单号"`
+	FollowOrderSn string          `json:"followOrderSn" comment:"跟随币安订单号"`
+	Symbol        string          `json:"symbol" comment:"交易对"`
+	OrderType     int             `json:"orderType" comment:"订单类型 0-主单 1-止损单 2-加仓 3-减仓"`
+	BuyPrice      decimal.Decimal `json:"buyPrice" comment:"购买金额"`
+	Price         decimal.Decimal `json:"price" comment:"委托价格"`
+	PriceU        decimal.Decimal `json:"priceU" comment:"委托价格(U)"`
+	FinalPrice    decimal.Decimal `json:"finalPrice" comment:"实际成交价"`
+	PositionSide  string          `json:"positionSide" comment:"持仓方向 LONG-多 SHORT-空"`
+	Side          string          `json:"side" comment:"买卖方向 SELL-卖 BUY-买"`
+	SignPrice     decimal.Decimal `json:"signPrice" comment:"行情价"`
+	TriggerTime   time.Time       `json:"triggerTime" comment:"触发时间"`
+	Status        int             `json:"status" comment:"状态 1-待下单 2-已下单 3-已成交 4-已平仓 5-已止损"`
+	common.ControlBy
+}
+
+func (s *LineReverseOrderUpdateReq) Generate(model *models.LineReverseOrder) {
+	if s.Id == 0 {
+		model.Model = common.Model{Id: s.Id}
+	}
+	model.OrderSn = s.OrderSn
+	model.OrderId = s.OrderId
+	model.FollowOrderSn = s.FollowOrderSn
+	model.Symbol = s.Symbol
+	model.OrderType = s.OrderType
+	model.BuyPrice = s.BuyPrice
+	model.Price = s.Price
+	model.PriceU = s.PriceU
+	model.FinalPrice = s.FinalPrice
+	model.PositionSide = s.PositionSide
+	model.Side = s.Side
+	model.SignPrice = s.SignPrice
+	model.TriggerTime = &s.TriggerTime
+	model.Status = s.Status
+	model.UpdateBy = s.UpdateBy // 添加这而，需要记录是被谁更新的
+}
+
+func (s *LineReverseOrderUpdateReq) GetId() interface{} {
+	return s.Id
+}
+
+// LineReverseOrderGetReq 功能获取请求参数
+type LineReverseOrderGetReq struct {
+	Id int `uri:"id"`
+}
+
+func (s *LineReverseOrderGetReq) GetId() interface{} {
+	return s.Id
+}
+
+// LineReverseOrderDeleteReq 功能删除请求参数
+type LineReverseOrderDeleteReq struct {
+	Ids []int `json:"ids"`
+}
+
+func (s *LineReverseOrderDeleteReq) GetId() interface{} {
+	return s.Ids
+}

app/admin/service/dto/line_reverse_position.go

@@ -0,0 +1,155 @@
+package dto
+
+import (
+	"go-admin/app/admin/models"
+	"go-admin/common/dto"
+	common "go-admin/common/models"
+
+	"github.com/shopspring/decimal"
+)
+
+type LineReversePositionGetPageReq struct {
+	dto.Pagination `search:"-"`
+	ApiId          int64  `form:"apiId"  search:"type:exact;column:api_id;table:line_reverse_position" comment:"api_id"`
+	ReverseApiId   int64  `form:"reverseApiId"  search:"type:exact;column:reverse_api_id;table:line_reverse_position" comment:"反单api_id"`
+	Side           string `form:"side"  search:"type:exact;column:side;table:line_reverse_position" comment:"买卖方向 BUY SELL"`
+	PositionSide   string `form:"positionSide"  search:"type:exact;column:position_side;table:line_reverse_position" comment:"持仓方向 LONG SHORT"`
+	Symbol         string `form:"symbol"  search:"type:contains;column:symbol;table:line_reverse_position" comment:"交易对"`
+	LineReversePositionOrder
+}
+
+type LineReversePositionOrder struct {
+	Id            string `form:"idOrder"  search:"type:order;column:id;table:line_reverse_position"`
+	ApiId         string `form:"apiIdOrder"  search:"type:order;column:api_id;table:line_reverse_position"`
+	ReverseApiId  string `form:"reverseApiIdOrder"  search:"type:order;column:reverse_api_id;table:line_reverse_position"`
+	ReverseAmount string `form:"reverseAmountOrder"  search:"type:order;column:reverse_amount;table:line_reverse_position"`
+	Side          string `form:"sideOrder"  search:"type:order;column:side;table:line_reverse_position"`
+	PositionSide  string `form:"positionSideOrder"  search:"type:order;column:position_side;table:line_reverse_position"`
+	Symbol        string `form:"symbolOrder"  search:"type:order;column:symbol;table:line_reverse_position"`
+	Status        string `form:"statusOrder"  search:"type:order;column:status;table:line_reverse_position"`
+	CreatedAt     string `form:"createdAtOrder"  search:"type:order;column:created_at;table:line_reverse_position"`
+	UpdatedAt     string `form:"updatedAtOrder"  search:"type:order;column:updated_at;table:line_reverse_position"`
+	DeletedAt     string `form:"deletedAtOrder"  search:"type:order;column:deleted_at;table:line_reverse_position"`
+	CreateBy      string `form:"createByOrder"  search:"type:order;column:create_by;table:line_reverse_position"`
+	UpdateBy      string `form:"updateByOrder"  search:"type:order;column:update_by;table:line_reverse_position"`
+}
+
+func (m *LineReversePositionGetPageReq) GetNeedSearch() interface{} {
+	return *m
+}
+
+type LineReversePositionInsertReq struct {
+	Id            int             `json:"-" comment:"主键"` // 主键
+	ApiId         int             `json:"apiId" comment:"api_id"`
+	ReverseApiId  int             `json:"reverseApiId" comment:"反单api_id"`
+	ReverseAmount decimal.Decimal `json:"reverseAmount" comment:"反单仓位"`
+	Side          string          `json:"side" comment:"买卖方向 BUY SELL"`
+	PositionSide  string          `json:"positionSide" comment:"持仓方向 LONG SHORT"`
+	Symbol        string          `json:"symbol" comment:"交易对"`
+	Status        int             `json:"status" comment:"仓位状态 1-已开仓 2-已平仓"`
+	common.ControlBy
+}
+
+func (s *LineReversePositionInsertReq) Generate(model *models.LineReversePosition) {
+	if s.Id == 0 {
+		model.Model = common.Model{Id: s.Id}
+	}
+	model.ApiId = s.ApiId
+	model.ReverseApiId = s.ReverseApiId
+	model.ReverseAmount = s.ReverseAmount
+	model.Side = s.Side
+	model.PositionSide = s.PositionSide
+	model.Symbol = s.Symbol
+	model.Status = s.Status
+	model.CreateBy = s.CreateBy // 添加这而，需要记录是被谁创建的
+}
+
+func (s *LineReversePositionInsertReq) GetId() interface{} {
+	return s.Id
+}
+
+type LineReversePositionUpdateReq struct {
+	Id            int             `uri:"id" comment:"主键"` // 主键
+	ApiId         int             `json:"apiId" comment:"api_id"`
+	ReverseApiId  int             `json:"reverseApiId" comment:"反单api_id"`
+	ReverseAmount decimal.Decimal `json:"reverseAmount" comment:"反单仓位"`
+	Side          string          `json:"side" comment:"买卖方向 BUY SELL"`
+	PositionSide  string          `json:"positionSide" comment:"持仓方向 LONG SHORT"`
+	Symbol        string          `json:"symbol" comment:"交易对"`
+	Status        int             `json:"status" comment:"仓位状态 1-已开仓 2-已平仓"`
+	common.ControlBy
+}
+
+func (s *LineReversePositionUpdateReq) Generate(model *models.LineReversePosition) {
+	if s.Id == 0 {
+		model.Model = common.Model{Id: s.Id}
+	}
+	model.ApiId = s.ApiId
+	model.ReverseApiId = s.ReverseApiId
+	model.ReverseAmount = s.ReverseAmount
+	model.Side = s.Side
+	model.PositionSide = s.PositionSide
+	model.Symbol = s.Symbol
+	model.Status = s.Status
+	model.UpdateBy = s.UpdateBy // 添加这而，需要记录是被谁更新的
+}
+
+func (s *LineReversePositionUpdateReq) GetId() interface{} {
+	return s.Id
+}
+
+// LineReversePositionGetReq 功能获取请求参数
+type LineReversePositionGetReq struct {
+	Id int `uri:"id"`
+}
+
+func (s *LineReversePositionGetReq) GetId() interface{} {
+	return s.Id
+}
+
+// LineReversePositionDeleteReq 功能删除请求参数
+type LineReversePositionDeleteReq struct {
+	Ids []int `json:"ids"`
+}
+
+func (s *LineReversePositionDeleteReq) GetId() interface{} {
+	return s.Ids
+}
+
+type LineReversePositionListResp struct {
+	Id                  int             `json:"id"`
+	ApiName             string          `json:"apiName"`
+	ReverseApiName      string          `json:"reverseApiName"`
+	Amount              decimal.Decimal `json:"amount"`
+	TotalAmount         decimal.Decimal `json:"totalAmount"`
+	ReverseAmount       decimal.Decimal `json:"reverseAmount"`
+	TotalReverseAmount  decimal.Decimal `json:"totalReverseAmount"`
+	Side                string          `json:"side"`
+	PositionSide        string          `json:"positionSide"`
+	Symbol              string          `json:"symbol"`
+	Status              int             `json:"status"`
+	ReverseStatus       int             `json:"reverseStatus"`
+	AveragePrice        decimal.Decimal `json:"averagePrice"`
+	ReverseAveragePrice decimal.Decimal `json:"reverseAveragePrice"`
+	CreatedAt           string          `json:"createdAt"`
+}
+
+type LineReversePositionCloseReq struct {
+	PositionId int `uri:"id" form:"id" comment:"仓位id"`
+}
+
+type LineReversePositionCloseBatchReq struct {
+	PositionSide  string `json:"positionSide"`
+	Symbol        string `json:"symbol"`
+	ReverseApiIds []int  `json:"reverseApiIds" form:"reverseApiIds" comment:"反单api_id"`
+}
+
+type GetPositionSymbolReq struct {
+	ReverseApiId int    `form:"reverseApiId" comment:"反单api_id"`
+	PositionSide string `form:"positionSide" comment:"持仓方向 LONG SHORT"`
+}
+
+type PositionSymbolResp struct {
+	Symbol string `json:"symbol"`
+	Code   string `json:"code"`
+}

app/admin/service/dto/line_reverse_setting.go

@@ -0,0 +1,95 @@
+package dto
+
+import (
+	"go-admin/app/admin/models"
+	"go-admin/common/dto"
+	common "go-admin/common/models"
+
+	"github.com/shopspring/decimal"
+)
+
+type LineReverseSettingGetPageReq struct {
+	dto.Pagination `search:"-"`
+	LineReverseSettingOrder
+}
+
+type LineReverseSettingOrder struct {
+	Id                  string `form:"idOrder"  search:"type:order;column:id;table:line_reverse_setting"`
+	ReverseOrderType    string `form:"reverseOrderTypeOrder"  search:"type:order;column:reverse_order_type;table:line_reverse_setting"`
+	ReversePremiumRatio string `form:"reversePremiumRatioOrder"  search:"type:order;column:reverse_premium_ratio;table:line_reverse_setting"`
+	CreatedAt           string `form:"createdAtOrder"  search:"type:order;column:created_at;table:line_reverse_setting"`
+	UpdatedAt           string `form:"updatedAtOrder"  search:"type:order;column:updated_at;table:line_reverse_setting"`
+	DeletedAt           string `form:"deletedAtOrder"  search:"type:order;column:deleted_at;table:line_reverse_setting"`
+	CreateBy            string `form:"createByOrder"  search:"type:order;column:create_by;table:line_reverse_setting"`
+	UpdateBy            string `form:"updateByOrder"  search:"type:order;column:update_by;table:line_reverse_setting"`
+}
+
+func (m *LineReverseSettingGetPageReq) GetNeedSearch() interface{} {
+	return *m
+}
+
+type LineReverseSettingInsertReq struct {
+	Id                  int             `json:"-" comment:"主键id"` // 主键id
+	ReverseOrderType    string          `json:"reverseOrderType" comment:"反单下单类型 LIMIT-限价 MARKET-市价"`
+	ReversePremiumRatio decimal.Decimal `json:"reversePremiumRatio" comment:"溢价百分比"`
+	TakeProfitRatio     decimal.Decimal `json:"takeProfitRatio" comment:"止盈百分比"`
+	StopLossRatio       decimal.Decimal `json:"stopLossRatio" comment:"止损百分比"`
+	common.ControlBy
+}
+
+func (s *LineReverseSettingInsertReq) Generate(model *models.LineReverseSetting) {
+	if s.Id == 0 {
+		model.Model = common.Model{Id: s.Id}
+	}
+	model.ReverseOrderType = s.ReverseOrderType
+	model.ReversePremiumRatio = s.ReversePremiumRatio
+	model.StopLossRatio = s.StopLossRatio
+	model.TakeProfitRatio = s.TakeProfitRatio
+	model.CreateBy = s.CreateBy // 添加这而，需要记录是被谁创建的
+}
+
+func (s *LineReverseSettingInsertReq) GetId() interface{} {
+	return s.Id
+}
+
+type LineReverseSettingUpdateReq struct {
+	Id                  int             `uri:"id" comment:"主键id"` // 主键id
+	ReverseOrderType    string          `json:"reverseOrderType" comment:"反单下单类型 LIMIT-限价 MARKET-市价"`
+	ReversePremiumRatio decimal.Decimal `json:"reversePremiumRatio" comment:"溢价百分比"`
+	TakeProfitRatio     decimal.Decimal `json:"takeProfitRatio" comment:"止盈百分比"`
+	StopLossRatio       decimal.Decimal `json:"stopLossRatio" comment:"止损百分比"`
+	common.ControlBy
+}
+
+func (s *LineReverseSettingUpdateReq) Generate(model *models.LineReverseSetting) {
+	if s.Id == 0 {
+		model.Model = common.Model{Id: s.Id}
+	}
+	model.ReverseOrderType = s.ReverseOrderType
+	model.ReversePremiumRatio = s.ReversePremiumRatio
+	model.StopLossRatio = s.StopLossRatio
+	model.TakeProfitRatio = s.TakeProfitRatio
+	model.UpdateBy = s.UpdateBy // 添加这而，需要记录是被谁更新的
+}
+
+func (s *LineReverseSettingUpdateReq) GetId() interface{} {
+	return s.Id
+}
+
+// LineReverseSettingGetReq 功能获取请求参数
+type LineReverseSettingGetReq struct {
+	Id int `uri:"id"`
+}
+
+func (s *LineReverseSettingGetReq) GetId() interface{} {
+	return s.Id
+}
+
+// LineReverseSettingDeleteReq 功能删除请求参数
+type LineReverseSettingDeleteReq struct {
+	Ids []int `json:"ids"`
+}
+
+func (s *LineReverseSettingDeleteReq) GetId() interface{} {
+	return s.Ids
+}

app/admin/service/dto/line_strategy_template.go

@@ -41,8 +41,8 @@ type LineStrategyTemplateInsertReq struct {
 	Direction     int             `json:"direction" comment:"涨跌方向 1-涨 2-跌"`
 	Percentag     decimal.Decimal `json:"percentag" comment:"涨跌点数"`
 	CompareType   int             `json:"compareType" comment:"比较类型 1-大于 2-大于等于 3-小于 4-小于等于 5等于 "`
-	TimeSlotStart int             `json:"timeSlotStart" comment:"时间段开始(分)"`
-	TimeSlotEnd   int             `json:"timeSlotEnd" comment:"时间断截至(分)"`
+	TimeSlotStart int             `json:"timeSlotStart" comment:"时间段(分)"`
+	// TimeSlotEnd   int             `json:"timeSlotEnd" comment:"时间断截至(分)"`
 	common.ControlBy
 }
 
@@ -63,13 +63,13 @@ func (s *LineStrategyTemplateInsertReq) Valid() error {
 		return errors.New("比较类型不合法")
 	}
 
-	if s.TimeSlotStart < 0 || s.TimeSlotEnd > 59 {
+	if s.TimeSlotStart < 0 {
 		return errors.New("时间段不合法")
 	}
 
-	if s.TimeSlotEnd < s.TimeSlotStart {
-		return errors.New("时间段不合法")
-	}
+	// if s.TimeSlotEnd < s.TimeSlotStart {
+	// 	return errors.New("时间段不合法")
+	// }
 
 	return nil
 }
@@ -83,7 +83,7 @@ func (s *LineStrategyTemplateInsertReq) Generate(model *models.LineStrategyTempl
 	model.Percentag = s.Percentag
 	model.CompareType = s.CompareType
 	model.TimeSlotStart = s.TimeSlotStart
-	model.TimeSlotEnd = s.TimeSlotEnd
+	// model.TimeSlotEnd = s.TimeSlotEnd
 	model.CreateBy = s.CreateBy // 添加这而，需要记录是被谁创建的
 }
 
@@ -97,8 +97,8 @@ type LineStrategyTemplateUpdateReq struct {
 	Direction     int             `json:"direction" comment:"涨跌方向 1-涨 2-跌"`
 	Percentag     decimal.Decimal `json:"percentag" comment:"涨跌点数"`
 	CompareType   int             `json:"compareType" comment:"比较类型 1-大于 2-大于等于 3-小于 4-小于等于 5等于 "`
-	TimeSlotStart int             `json:"timeSlotStart" comment:"时间段开始(分)"`
-	TimeSlotEnd   int             `json:"timeSlotEnd" comment:"时间断截至(分)"`
+	TimeSlotStart int             `json:"timeSlotStart" comment:"时间段(分)"`
+	// TimeSlotEnd   int             `json:"timeSlotEnd" comment:"时间断截至(分)"`
 	common.ControlBy
 }
 
@@ -120,13 +120,13 @@ func (s *LineStrategyTemplateUpdateReq) Valid() error {
 		return errors.New("比较类型不合法")
 	}
 
-	if s.TimeSlotStart < 0 || s.TimeSlotEnd > 59 {
+	if s.TimeSlotStart < 0 {
 		return errors.New("时间段不合法")
 	}
 
-	if s.TimeSlotEnd < s.TimeSlotStart {
-		return errors.New("时间段不合法")
-	}
+	// if s.TimeSlotEnd < s.TimeSlotStart {
+	// 	return errors.New("时间段不合法")
+	// }
 
 	return nil
 }
@@ -139,7 +139,7 @@ func (s *LineStrategyTemplateUpdateReq) Generate(model *models.LineStrategyTempl
 	model.Percentag = s.Percentag
 	model.CompareType = s.CompareType
 	model.TimeSlotStart = s.TimeSlotStart
-	model.TimeSlotEnd = s.TimeSlotEnd
+	// model.TimeSlotEnd = s.TimeSlotEnd
 	model.UpdateBy = s.UpdateBy // 添加这而，需要记录是被谁更新的
 }
 

app/admin/service/line_api_user.go

@@ -8,6 +8,7 @@ import (
 	"github.com/bytedance/sonic"
 	"github.com/go-admin-team/go-admin-core/logger"
 	"github.com/go-admin-team/go-admin-core/sdk/service"
+	"github.com/go-redis/redis/v8"
 	"gorm.io/gorm"
 
 	"go-admin/app/admin/models"
@@ -25,6 +26,43 @@ type LineApiUser struct {
 	service.Service
 }
 
+// 获取所有启用的反单api用户
+func (e LineApiUser) GetReverseApiOptionsAll(user *[]dto.LineApiUserOptionResp) error {
+	var data models.LineApiUser
+	var datas []models.LineApiUser
+
+	if err := e.Orm.Model(&data).Where("open_status = 1 AND subordinate = '2'").Find(&datas).Error; err != nil {
+		e.Log.Errorf("LineApiUserService GetReverseApiOptionsAll error:%s \r\n", err)
+		return err
+	}
+
+	for _, item := range datas {
+		*user = append(*user, dto.LineApiUserOptionResp{
+			Id:   item.Id,
+			Name: item.ApiName,
+		})
+	}
+
+	return nil
+}
+
+// 获取可以绑定的api列表
+func (e LineApiUser) GetReverseApiOptions(req *dto.GetReverseApiOptionsReq, user *[]models.LineApiUser) error {
+	query := e.Orm.Model(models.LineApiUser{}).
+		Where("subordinate ='0' and id != ?", req.Id)
+
+	if req.ApiId > 0 {
+		query = query.Or(" id =?", req.ApiId)
+	}
+
+	if err := query.Find(user).Error; err != nil {
+		e.Log.Errorf("LineApiUserService GetReverseApiOptions error:%s \r\n", err)
+		return err
+	}
+
+	return nil
+}
+
 // GetPage 获取LineApiUser列表
 func (e *LineApiUser) GetPage(c *dto.LineApiUserGetPageReq, p *actions.DataPermission, list *[]models.LineApiUser, count *int64) error {
 	var err error
@@ -97,13 +135,37 @@ func (e *LineApiUser) Insert(c *dto.LineApiUserInsertReq) error {
 	var err error
 	var data models.LineApiUser
 	c.Generate(&data)
-	err = e.Orm.Create(&data).Error
+	err = e.Orm.Transaction(func(tx *gorm.DB) error {
+		if c.ReverseApiId > 0 {
+			var count int64
+			if err2 := tx.Model(models.LineApiUser{}).Where("subordinate <> '0' AND id=?", c.ReverseApiId).Count(&count).Error; err2 != nil {
+				return err2
+			}
+			if count > 0 {
+				return errors.New("反向api已被使用")
+			}
+
+			if err2 := tx.Model(models.LineApiUser{}).Where("id =?", c.ReverseApiId).Update("subordinate", '2').Error; err2 != nil {
+				return err2
+			}
+			data.Subordinate = "1"
+		}
+
+		if err2 := tx.Create(&data).Error; err2 != nil {
+			return err2
+		}
+
+		return nil
+	})
 	if err != nil {
 		e.Log.Errorf("LineApiUserService Insert error:%s \r\n", err)
 		return err
 	}
 
-	e.saveCache(data)
+	if err2 := e.CacheRelation(); err2 != nil {
+		return err2
+	}
+
 	val, _ := sonic.MarshalString(&data)
 
 	if val != "" {
@@ -131,7 +193,7 @@ func (e *LineApiUser) restartWebsocket(data models.LineApiUser) {
 		fuSocket.Stop()
 	}
 
-	e.saveCache(data)
+	e.CacheRelation()
 
 	OpenUserBinanceWebsocket(data)
 }
@@ -149,6 +211,23 @@ func (e *LineApiUser) saveCache(data models.LineApiUser) {
 	}
 }
 
+// 缓存关系
+// cacheAll 是否缓存所有关系
+func (e *LineApiUser) CacheRelation() error {
+	var datas *[]models.LineApiUser
+
+	if err := e.Orm.Model(&models.LineApiUser{}).Where("open_status = 1").Find(&datas).Error; err != nil {
+		return err
+	}
+
+	for _, data := range *datas {
+		// cacheStrs = append(cacheStrs, fmt.Sprintf(rediskey.API_USER, data.Id))
+		e.saveCache(data)
+	}
+
+	return nil
+}
+
 /*
 打开用户websocket订阅
 */
@@ -197,6 +276,7 @@ func (e *LineApiUser) Update(c *dto.LineApiUserUpdateReq, p *actions.DataPermiss
 		actions.Permission(data.TableName(), p),
 	).First(&data, c.GetId())
 	oldApiKey := data.ApiKey
+	oldReverseApiId := data.ReverseApiId
 
 	c.Generate(&data)
 
@@ -204,6 +284,33 @@ func (e *LineApiUser) Update(c *dto.LineApiUserUpdateReq, p *actions.DataPermiss
 
 	//事务
 	err = e.Orm.Transaction(func(tx *gorm.DB) error {
+		if data.ReverseApiId > 0 && data.ReverseApiId != oldReverseApiId {
+			var count int64
+			if err2 := tx.Model(models.LineApiUser{}).Where("subordinate <> '0' AND id=?", c.ReverseApiId).Count(&count).Error; err2 != nil {
+				return err2
+			}
+			if count > 0 {
+				return errors.New("反向api已被使用")
+			}
+
+			if err2 := tx.Model(models.LineApiUser{}).Where("id =?", c.ReverseApiId).Update("subordinate", "2").Error; err2 != nil {
+				return err2
+			}
+
+			data.Subordinate = "1"
+		}
+
+		if oldReverseApiId > 0 && oldReverseApiId != data.ReverseApiId {
+			if err2 := tx.Model(models.LineApiUser{}).Where("id =?", oldReverseApiId).Update("subordinate", "0").Error; err2 != nil {
+				e.Log.Errorf("解绑反向api失败 api:%d err:%v", oldReverseApiId, err2)
+				return fmt.Errorf("解绑反向api失败")
+			}
+
+			if data.ReverseApiId == 0 {
+				data.Subordinate = "0"
+			}
+		}
+
 		db := tx.Save(&data)
 		if err = db.Error; err != nil {
 			e.Log.Errorf("LineApiUserService Save error:%s \r\n", err)
@@ -226,7 +333,9 @@ func (e *LineApiUser) Update(c *dto.LineApiUserUpdateReq, p *actions.DataPermiss
 		return err
 	}
 
-	e.saveCache(data)
+	if err2 := e.CacheRelation(); err2 != nil {
+		return err2
+	}
 
 	//旧key和新的key不一样，则关闭旧的websocket
 	if oldApiKey != data.ApiKey {
@@ -289,10 +398,14 @@ func (e *LineApiUser) Remove(d *dto.LineApiUserDeleteReq, p *actions.DataPermiss
 
 	_, err := helper.DefaultRedis.BatchDeleteKeys(delKeys)
 
-	if err != nil {
+	if err != nil && !errors.Is(err, redis.Nil) {
 		e.Log.Error("批量删除api_user key失败", err)
 	}
 
+	if err2 := e.CacheRelation(); err2 != nil {
+		return err2
+	}
+
 	return nil
 }
 
@@ -414,3 +527,44 @@ func (e *LineApiUser) GetActiveApis(apiIds []int) ([]int, error) {
 
 	return result, nil
 }
+
+// GetUnBindApiUser 获取未绑定反向下单的的api用户
+func (e *LineApiUser) GetUnBindApiUser(req *dto.GetUnBindReverseReq, list *[]dto.UnBindReverseResp) error {
+	var datas []models.LineApiUser
+	var data models.LineApiUser
+	var count int64
+
+	if req.ApiId > 0 {
+		e.Orm.Model(data).Where("id =? AND subordinate = '2'", req.ApiId).Count(&count)
+
+		if count > 0 {
+			return nil
+		}
+	}
+
+	query := e.Orm.Model(&data).
+		Where("open_status =1 AND exchange_type = ? ", req.ExchangeType)
+
+	if err := query.
+		Find(&datas).Error; err != nil {
+		e.Log.Error("获取未绑定用户失败:", err)
+		return fmt.Errorf("获取未绑定用户失败")
+	}
+
+	for _, item := range datas {
+		if item.Id == req.ApiId {
+			continue
+		}
+
+		listItem := dto.UnBindReverseResp{
+			Id:       item.Id,
+			UserId:   item.UserId,
+			ApiName:  item.ApiName,
+			Disabled: item.Subordinate != "0",
+		}
+
+		(*list) = append((*list), listItem)
+	}
+
+	return nil
+}

app/admin/service/line_pre_order.go

@@ -264,8 +264,8 @@ func (e *LinePreOrder) Remove(d *dto.LinePreOrderDeleteReq, p *actions.DataPermi
 	}
 
 	positions := map[string]positiondto.LinePreOrderPositioinDelReq{}
-	addPosition := positiondto.AddPositionList{}
-	reduceItem := positiondto.ReduceListItem{}
+	addPosition := binanceservice.AddPositionList{}
+	reduceItem := binanceservice.ReduceListItem{}
 	futAddPosition := map[int]string{}
 	spotAddPosition := map[int]string{}
 	futReduces := map[int]string{}
@@ -279,6 +279,8 @@ func (e *LinePreOrder) Remove(d *dto.LinePreOrderDeleteReq, p *actions.DataPermi
 	futReduceVal, _ := helper.DefaultRedis.GetAllList(spotAddPositionKey)
 	spotAddPositionVal, _ := helper.DefaultRedis.GetAllList(futReduceKey)
 	spotReduceVal, _ := helper.DefaultRedis.GetAllList(spotReduceKey)
+	spotStrategyMap := e.GetStrategyOrderListMap(1)
+	futStrategyMap := e.GetStrategyOrderListMap(2)
 
 	for _, v := range futAddPositionVal {
 		sonic.Unmarshal([]byte(v), &addPosition)
@@ -337,8 +339,14 @@ func (e *LinePreOrder) Remove(d *dto.LinePreOrderDeleteReq, p *actions.DataPermi
 		if val, ok := spotRedces[order.Id]; ok {
 			helper.DefaultRedis.LRem(spotReduceKey, val)
 		}
+		var tradedSetKey string
+		if order.SymbolType == 1 {
+			tradedSetKey = fmt.Sprintf(global.TICKER_SPOT, order.ExchangeType, order.Symbol)
+		} else {
+			tradedSetKey = fmt.Sprintf(global.TICKER_FUTURES, order.ExchangeType, order.Symbol)
+		}
 
-		tradeSet, _ := helper.GetObjString[models2.TradeSet](helper.DefaultRedis, fmt.Sprintf(global.TICKER_SPOT, order.ExchangeType, order.Symbol))
+		tradeSet, _ := helper.GetObjString[models2.TradeSet](helper.DefaultRedis, tradedSetKey)
 		redisList.Price = utility.StringToDecimal(redisList.Price).Truncate(int32(tradeSet.PriceDigit)).String()
 		marshal, _ := sonic.Marshal(redisList)
 		if order.SymbolType == 1 {
@@ -349,6 +357,13 @@ func (e *LinePreOrder) Remove(d *dto.LinePreOrderDeleteReq, p *actions.DataPermi
 			helper.DefaultRedis.LRem(listKey, string(marshal))
 		}
 
+		switch {
+		case order.StrategyTemplateType == 1 && order.SymbolType == 1:
+			e.RemoveStrategyOrderCache(order.Id, order.SymbolType, order.ExchangeType, &spotStrategyMap)
+		case order.StrategyTemplateType == 1 && order.SymbolType == 2:
+			e.RemoveStrategyOrderCache(order.Id, order.SymbolType, order.ExchangeType, &futStrategyMap)
+		}
+
 		//会影响持仓的
 		removeSymbolKey := fmt.Sprintf("%v_%s_%s_%s_%v", order.ApiId, order.ExchangeType, order.Symbol, order.Site, order.SymbolType)
 
@@ -363,6 +378,7 @@ func (e *LinePreOrder) Remove(d *dto.LinePreOrderDeleteReq, p *actions.DataPermi
 		}
 
 		binanceservice.MainClosePositionClearCache(order.Id, order.SymbolType)
+		binanceservice.RemoveReduceReduceCacheByMainId(order.Id, order.SymbolType)
 
 		ints = append(ints, order.Id)
 	}
@@ -395,7 +411,7 @@ func (e *LinePreOrder) Remove(d *dto.LinePreOrderDeleteReq, p *actions.DataPermi
 }
 
 // 单个新增订单
-func (e *LinePreOrder) AddPreOrderCheck(req *dto.LineAddPreOrderReq, p *actions.DataPermission, errs *[]error) error {
+func (e *LinePreOrder) AddPreOrderCheck(req *dto.LineAddPreOrderReq, p *actions.DataPermission, errs *[]error, tickerSymbol string) error {
 	apiUserService := LineApiUser{Service: e.Service}
 	apiIds := []int{}
 	apiUserIds := strings.Split(req.ApiUserId, ",")
@@ -423,14 +439,14 @@ func (e *LinePreOrder) AddPreOrderCheck(req *dto.LineAddPreOrderReq, p *actions.
 				*errs = append(*errs, fmt.Errorf("api用户未激活:%v", item))
 			}
 		}
-		e.AddPreOrder(req, activeApiIds, p, errs)
+		e.AddPreOrder(req, activeApiIds, p, errs, tickerSymbol)
 	}
 
 	return nil
 }
 
 // AddPreOrder 单个添加
-func (e *LinePreOrder) AddPreOrder(req *dto.LineAddPreOrderReq, apiUserIds []int, p *actions.DataPermission, errs *[]error) error {
+func (e *LinePreOrder) AddPreOrder(req *dto.LineAddPreOrderReq, apiUserIds []int, p *actions.DataPermission, errs *[]error, tickerSymbol string) error {
 	if req.SaveTemplate == "2" || req.SaveTemplate == "1" { //2 = 只保存模板 1= 保存模板并下单
 		var templateLog dto.LineAddPreOrderReq
 		copier.Copy(&templateLog, req)
@@ -576,6 +592,7 @@ func (e *LinePreOrder) AddPreOrder(req *dto.LineAddPreOrderReq, apiUserIds []int
 
 		preOrderStatus := models.LinePreOrderStatus{}
 		preOrderStatus.OrderSn = AddOrder.OrderSn
+		mainPrice := utility.StringToDecimal(AddOrder.Price)
 
 		//订单配置信息
 		preOrderExts := make([]models.LinePreOrderExt, 0)
@@ -590,6 +607,12 @@ func (e *LinePreOrder) AddPreOrder(req *dto.LineAddPreOrderReq, apiUserIds []int
 			TpTpPriceRatio:     req.ProfitTpTpPriceRatio,
 			TpSlPriceRatio:     req.ProfitTpSlPriceRatio,
 		}
+
+		if req.PricePattern == "mixture" {
+			defultExt.TakeProfitRatio = mainPrice.Div(utility.StrToDecimal(req.Profit)).Sub(decimal.NewFromInt(1)).Abs().Mul(decimal.NewFromInt(100)).Truncate(2)
+			defultExt.StopLossRatio = mainPrice.Div(req.StopLoss).Sub(decimal.NewFromInt(1)).Abs().Mul(decimal.NewFromInt(100)).Truncate(2)
+		}
+
 		//减仓单
 		defultExt2 := models.LinePreOrderExt{
 			AddType:            2,
@@ -601,17 +624,12 @@ func (e *LinePreOrder) AddPreOrder(req *dto.LineAddPreOrderReq, apiUserIds []int
 			TakeProfitNumRatio: decimal.NewFromInt(100), //减仓止盈默认100%
 			StopLossRatio:      req.ReduceStopLossRatio,
 		}
-		mainPrice := utility.StringToDecimal(AddOrder.Price)
 		mainAmount := utility.SafeDiv(buyPrice, mainPrice)
 		defultExt.TotalAfter = utility.StrToDecimal(AddOrder.Num).Truncate(int32(tradeSet.AmountDigit))
 		defultExt2.TotalBefore = defultExt.TotalAfter
 
 		default2NumPercent := utility.SafeDiv(decimal.NewFromInt(100).Sub(req.ReduceNumRatio), decimal.NewFromInt(100))
 		defultExt2.TotalAfter = mainAmount.Mul(default2NumPercent).Truncate(int32(tradeSet.AmountDigit))
-		defultExt2.ReTakeRatio = utility.SafeDiv(req.ReducePriceRatio, default2NumPercent).Truncate(2)
-
-		preOrderExts = append(preOrderExts, defultExt)
-		preOrderExts = append(preOrderExts, defultExt2)
 
 		calculateResp := dto.CalculateBreakEvenRatioResp{}
 		mainParam := dto.CalculateBreakEevenRatioReq{
@@ -627,15 +645,22 @@ func (e *LinePreOrder) AddPreOrder(req *dto.LineAddPreOrderReq, apiUserIds []int
 			AddPositionVal:   req.ReduceNumRatio,
 		}
 
+		if req.PricePattern == "mixture" {
+			mainParam.LossEndPercent = mainPrice.Div(req.ReducePriceRatio).Sub(decimal.NewFromInt(1)).Abs().Mul(decimal.NewFromInt(100)).Truncate(2)
+			defultExt2.PriceRatio = mainParam.LossEndPercent
+		}
+
 		//计算减仓后
-		mainParam.LossEndPercent = req.ReducePriceRatio
+		defultExt2.ReTakeRatio = utility.SafeDiv(mainParam.LossEndPercent, default2NumPercent).Truncate(2)
 		mainParam.RemainingQuantity = mainAmount
 		e.CalculateBreakEvenRatio(&mainParam, &calculateResp, tradeSet)
 		mainParam.RemainingQuantity = calculateResp.RemainingQuantity //mainAmount.Mul(decimal.NewFromInt(100).Sub(req.ReduceNumRatio).Div(decimal.NewFromInt(100))).Truncate(int32(tradeSet.AmountDigit))
 		mainParam.TotalLossAmountU = calculateResp.TotalLossAmountU   //buyPrice.Mul(req.ReducePriceRatio.Div(decimal.NewFromInt(100)).Truncate(4)).Truncate(int32(tradeSet.PriceDigit))
 		req.ReduceReTakeProfitRatio = calculateResp.Ratio
-		mainParam.LossBeginPercent = req.ReducePriceRatio
+		mainParam.LossBeginPercent = mainParam.LossEndPercent
 		// defultExt.ReTakeRatio = calculateResp.Ratio
+		preOrderExts = append(preOrderExts, defultExt)
+		preOrderExts = append(preOrderExts, defultExt2)
 
 		for index, addPosition := range req.Ext {
 			ext := models.LinePreOrderExt{
@@ -907,7 +932,6 @@ func saveOrderCache(req *dto.LineAddPreOrderReq, AddOrder models.LinePreOrder, l
 		list.Percentag = linestrategyTemplate.Percentag
 		list.CompareType = linestrategyTemplate.CompareType
 		list.TimeSlotStart = linestrategyTemplate.TimeSlotStart
-		list.TimeSlotEnd = linestrategyTemplate.TimeSlotEnd
 
 		marshal, _ = sonic.Marshal(&list)
 		if AddOrder.SymbolType == global.SYMBOL_SPOT {
@@ -1015,7 +1039,6 @@ func createPreReduceOrder(preOrder *models.LinePreOrder, ext models.LinePreOrder
 
 		stopOrder.OrderType = 4
 		stopOrder.Status = 0
-		stopOrder.Rate = ext.PriceRatio.String()
 		stopOrder.Num = ext.TotalAfter.Sub(ext.TotalBefore).Abs().Truncate(int32(tradeSet.AmountDigit)).String()
 		stopOrder.BuyPrice = "0"
 		stopOrder.Rate = ext.PriceRatio.String()
@@ -1250,7 +1273,15 @@ func (e *LinePreOrder) AddBatchPreOrder(batchReq *dto.LineBatchAddPreOrderReq, p
 		batchReq.Symbol = symbolGroupInfo.Symbol
 	}
 
+	//脚本次数
+	// if batchReq.OrderNum > 0 {
 	apiUserIds := strings.Split(batchReq.ApiUserId, ",")
+	var tickerSymbol string
+	if batchReq.SymbolType == global.SYMBOL_SPOT {
+		tickerSymbol = helper.DefaultRedis.Get(rediskey.SpotSymbolTicker).Val()
+	} else {
+		tickerSymbol = helper.DefaultRedis.Get(rediskey.FutSymbolTicker).Val()
+	}
 
 	if batchReq.Script == "1" {
 		//scriptLogs := make([]models.LinePreScript, 0)
@@ -1309,11 +1340,15 @@ func (e *LinePreOrder) AddBatchPreOrder(batchReq *dto.LineBatchAddPreOrderReq, p
 				req.ReduceTakeProfitRatio = batchReq.ReduceTakeProfitRatio
 				req.CreateBy = batchReq.CreateBy
 
-				e.AddPreOrderCheck(&req, p, errs)
+				e.AddPreOrderCheck(&req, p, errs, tickerSymbol)
 			}
 		}
 	}
 	return nil
+	// } else {
+	// 	*errs = append(*errs, errors.New("请选择运行次数"))
+	// 	return nil
+	// }
 }
 
 // QuickAddPreOrder 模板快速下单
@@ -1326,7 +1361,13 @@ func (e *LinePreOrder) QuickAddPreOrder(quickReq *dto.QuickAddPreOrderReq, p *ac
 			var addPreOrderParams dto.LineAddPreOrderReq
 			sonic.Unmarshal([]byte(log.Params), &addPreOrderParams)
 
-			err := e.AddPreOrderCheck(&addPreOrderParams, p, errs)
+			var tickerSymbol string
+			if addPreOrderParams.OrderType == global.SYMBOL_SPOT {
+				tickerSymbol = helper.DefaultRedis.Get(rediskey.SpotSymbolTicker).Val()
+			} else {
+				tickerSymbol = helper.DefaultRedis.Get(rediskey.FutSymbolTicker).Val()
+			}
+			err := e.AddPreOrderCheck(&addPreOrderParams, p, errs, tickerSymbol)
 			// err := e.AddPreOrder(&addPreOrderParams, p, errs, tickerSymbol)
 			if err != nil {
 				*errs = append(*errs, fmt.Errorf("api_id:%s 获取交易对:%s 生成订单失败", addPreOrderParams.ApiUserId, addPreOrderParams.Symbol))
@@ -1678,18 +1719,23 @@ func (e *LinePreOrder) CalculateAmount(req dto.ManuallyCover, totalNum, lastPric
 	} else {
 		decimalValue := utility.StringToDecimal(req.Value)
 		if notUsdt {
-			tickerSymbolMaps, _ := cacheservice.GetExchangeTradeSets(global.EXCHANGE_BINANCE, 2)
+			tickerSymbolMaps := make([]dto.Ticker, 0)
+			tickerSymbol := helper.DefaultRedis.Get(rediskey.SpotSymbolTicker).Val()
+			if err := sonic.Unmarshal([]byte(tickerSymbol), &tickerSymbolMaps); err != nil {
+				return decimal.Zero, err
+			}
+
 			var tickerPrice decimal.Decimal
 			for _, symbolMap := range tickerSymbolMaps {
 				if symbolMap.Symbol == strings.ToUpper(symbolInfo.BaseAsset+"USDT") {
-					tickerPrice, _ = decimal.NewFromString(symbolMap.LastPrice)
+					tickerPrice, _ = decimal.NewFromString(symbolMap.Price)
 					break
 				}
 			}
 
 			for _, symbolMap := range tickerSymbolMaps {
 				if symbolMap.Symbol == strings.ToUpper(symbolInfo.QuoteAsset+"USDT") {
-					uTickerPrice, _ := decimal.NewFromString(symbolMap.LastPrice)
+					uTickerPrice, _ := decimal.NewFromString(symbolMap.Price)
 					div := utility.SafeDiv(tickerPrice, decimal.NewFromInt(1).Div(uTickerPrice))
 					amt = utility.SafeDiv(decimalValue, div)
 					break
@@ -1972,6 +2018,8 @@ func (e *LinePreOrder) ClearUnTriggered() error {
 	var orderLists []models.LinePreOrder
 	positions := map[string]positiondto.LinePreOrderPositioinDelReq{}
 	e.Orm.Model(&models.LinePreOrder{}).Where("main_id = 0 AND pid = 0 AND status = '0'").Find(&orderLists).Unscoped().Delete(&models.LinePreOrder{})
+	spotStrategyMap := e.GetStrategyOrderListMap(1)
+	futStrategyMap := e.GetStrategyOrderListMap(2)
 
 	for _, order := range orderLists {
 		redisList := dto.PreOrderRedisList{
@@ -1983,17 +2031,35 @@ func (e *LinePreOrder) ClearUnTriggered() error {
 			OrderSn:     order.OrderSn,
 			QuoteSymbol: order.QuoteSymbol,
 		}
-		tradeSet, _ := helper.GetObjString[models2.TradeSet](helper.DefaultRedis, fmt.Sprintf(global.TICKER_SPOT, order.ExchangeType, order.Symbol))
+
+		var tradedSetKey string
+		if order.SymbolType == 1 {
+			tradedSetKey = fmt.Sprintf(global.TICKER_SPOT, order.ExchangeType, order.Symbol)
+		} else {
+			tradedSetKey = fmt.Sprintf(global.TICKER_FUTURES, order.ExchangeType, order.Symbol)
+		}
+
+		tradeSet, _ := helper.GetObjString[models2.TradeSet](helper.DefaultRedis, tradedSetKey)
 		redisList.Price = utility.StringToDecimal(redisList.Price).Truncate(int32(tradeSet.PriceDigit)).String()
 		marshal, _ := sonic.Marshal(redisList)
+
 		if order.SymbolType == 1 {
 			key := fmt.Sprintf(rediskey.PreFutOrderList, order.ExchangeType)
+
 			helper.DefaultRedis.LRem(key, string(marshal))
 		} else {
 			key := fmt.Sprintf(rediskey.PreSpotOrderList, order.ExchangeType)
+
 			helper.DefaultRedis.LRem(key, string(marshal))
 		}
 
+		switch {
+		case order.StrategyTemplateType == 1 && order.SymbolType == 1:
+			e.RemoveStrategyOrderCache(order.Id, order.SymbolType, order.ExchangeType, &spotStrategyMap)
+		case order.StrategyTemplateType == 1 && order.SymbolType == 2:
+			e.RemoveStrategyOrderCache(order.Id, order.SymbolType, order.ExchangeType, &futStrategyMap)
+		}
+
 		//会影响持仓的
 		removeSymbolKey := fmt.Sprintf("%v_%s_%s_%s_%v", order.ApiId, order.ExchangeType, order.Symbol, order.Site, order.SymbolType)
 
@@ -2033,6 +2099,60 @@ func (e *LinePreOrder) ClearUnTriggered() error {
 	return nil
 }
 
+// 移除待策略待触发单
+func (e *LinePreOrder) RemoveStrategyOrderCache(orderId int, symbolType int, exchangeType string, caches *map[string][]dto.StrategyOrderRedisList) {
+	strategys, _ := (*caches)[exchangeType]
+	var strategyListKey string
+
+	if symbolType == 1 {
+		strategyListKey = fmt.Sprintf(rediskey.StrategySpotOrderList, exchangeType)
+	} else {
+		strategyListKey = fmt.Sprintf(rediskey.StrategyFutOrderList, exchangeType)
+	}
+
+	for _, strategy := range strategys {
+		if strategy.Id == orderId {
+			strategyVal, _ := sonic.MarshalString(strategy)
+			helper.DefaultRedis.LRem(strategyListKey, strategyVal)
+		}
+	}
+}
+
+// 获取策略订单缓存列表
+// symbolType 1现货 2合约
+func (e *LinePreOrder) GetStrategyOrderListMap(symbolType int) map[string][]dto.StrategyOrderRedisList {
+	result := make(map[string][]dto.StrategyOrderRedisList)
+	var key string
+	exchanges := []string{global.EXCHANGE_BINANCE}
+
+	if symbolType == 1 {
+		key = rediskey.StrategySpotOrderList
+	} else {
+		key = rediskey.StrategyFutOrderList
+	}
+
+	for _, exchange := range exchanges {
+		newKey := fmt.Sprintf(key, exchange)
+		vals, _ := helper.DefaultRedis.GetAllList(newKey)
+		itemData := make([]dto.StrategyOrderRedisList, 0)
+		item := dto.StrategyOrderRedisList{}
+
+		for _, v := range vals {
+			sonic.Unmarshal([]byte(v), &item)
+
+			if item.Id > 0 {
+				itemData = append(itemData, item)
+			}
+		}
+
+		if len(itemData) > 0 {
+			result[exchange] = itemData
+		}
+	}
+
+	return result
+}
+
 func (e *LinePreOrder) QueryOrder(req *dto.QueryOrderReq) (res interface{}, err error) {
 	var apiUserInfo models.LineApiUser
 	e.Orm.Model(&models.LineApiUser{}).Where("id = ?", req.ApiId).Find(&apiUserInfo)
@@ -2085,9 +2205,9 @@ func (e *LinePreOrder) GenerateOrder(req *dto.LineAddPreOrderReq) error {
 	var tickerPrice decimal.Decimal
 
 	if req.SymbolType == 1 {
-		tradeSet, _ = cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, req.Symbol, 1)
+		tradeSet, _ = cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, req.Symbol, 0)
 	} else {
-		tradeSet, _ = cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, req.Symbol, 2)
+		tradeSet, _ = cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, req.Symbol, 1)
 	}
 
 	if tradeSet.LastPrice == "" {
@@ -2126,15 +2246,18 @@ func (e *LinePreOrder) GenerateOrder(req *dto.LineAddPreOrderReq) error {
 		AddPositionVal:   req.ReduceNumRatio,
 	}
 
+	if req.PricePattern == "mixture" {
+		mainParam.LossEndPercent = price.Div(req.ReducePriceRatio).Sub(decimal.NewFromInt(1)).Abs().Mul(decimal.NewFromInt(100)).Truncate(2)
+	}
+
 	//计算减仓后
-	mainParam.LossEndPercent = req.ReducePriceRatio
 	mainParam.RemainingQuantity = mainAmount
 	mainParam.AddType = 2
 	e.CalculateBreakEvenRatio(&mainParam, &calculateResp, tradeSet)
 	mainParam.RemainingQuantity = calculateResp.RemainingQuantity
 	mainParam.TotalLossAmountU = calculateResp.TotalLossAmountU
 	req.ReduceReTakeProfitRatio = calculateResp.Ratio
-	lossBeginPercent = req.ReducePriceRatio
+	lossBeginPercent = mainParam.LossEndPercent
 
 	//顺序排序
 	sort.Slice(req.Ext, func(i, j int) bool {

app/admin/service/line_reverse_order.go

@@ -0,0 +1,114 @@
+package service
+
+import (
+	"errors"
+
+	"github.com/go-admin-team/go-admin-core/sdk/service"
+	"gorm.io/gorm"
+
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/actions"
+	cDto "go-admin/common/dto"
+)
+
+type LineReverseOrder struct {
+	service.Service
+}
+
+// GetPage 获取LineReverseOrder列表
+func (e *LineReverseOrder) GetPage(c *dto.LineReverseOrderGetPageReq, p *actions.DataPermission, list *[]models.LineReverseOrder, count *int64) error {
+	var err error
+	var data models.LineReverseOrder
+	query := e.Orm.Model(&data).
+		Scopes(
+			cDto.MakeCondition(c.GetNeedSearch()),
+			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
+			actions.Permission(data.TableName(), p),
+		)
+
+	if c.Category >= 0 {
+		query = query.Where("category =?", c.Category)
+	}
+
+	err = query.
+		Find(list).Limit(-1).Offset(-1).
+		Count(count).Error
+	if err != nil {
+		e.Log.Errorf("LineReverseOrderService GetPage error:%s \r\n", err)
+		return err
+	}
+	return nil
+}
+
+// Get 获取LineReverseOrder对象
+func (e *LineReverseOrder) Get(d *dto.LineReverseOrderGetReq, p *actions.DataPermission, model *models.LineReverseOrder) error {
+	var data models.LineReverseOrder
+
+	err := e.Orm.Model(&data).
+		Scopes(
+			actions.Permission(data.TableName(), p),
+		).
+		First(model, d.GetId()).Error
+	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
+		err = errors.New("查看对象不存在或无权查看")
+		e.Log.Errorf("Service GetLineReverseOrder error:%s \r\n", err)
+		return err
+	}
+	if err != nil {
+		e.Log.Errorf("db error:%s", err)
+		return err
+	}
+	return nil
+}
+
+// Insert 创建LineReverseOrder对象
+func (e *LineReverseOrder) Insert(c *dto.LineReverseOrderInsertReq) error {
+	var err error
+	var data models.LineReverseOrder
+	c.Generate(&data)
+	err = e.Orm.Create(&data).Error
+	if err != nil {
+		e.Log.Errorf("LineReverseOrderService Insert error:%s \r\n", err)
+		return err
+	}
+	return nil
+}
+
+// Update 修改LineReverseOrder对象
+func (e *LineReverseOrder) Update(c *dto.LineReverseOrderUpdateReq, p *actions.DataPermission) error {
+	var err error
+	var data = models.LineReverseOrder{}
+	e.Orm.Scopes(
+		actions.Permission(data.TableName(), p),
+	).First(&data, c.GetId())
+	c.Generate(&data)
+
+	db := e.Orm.Save(&data)
+	if err = db.Error; err != nil {
+		e.Log.Errorf("LineReverseOrderService Save error:%s \r\n", err)
+		return err
+	}
+	if db.RowsAffected == 0 {
+		return errors.New("无权更新该数据")
+	}
+	return nil
+}
+
+// Remove 删除LineReverseOrder
+func (e *LineReverseOrder) Remove(d *dto.LineReverseOrderDeleteReq, p *actions.DataPermission) error {
+	var data models.LineReverseOrder
+
+	db := e.Orm.Model(&data).
+		Scopes(
+			actions.Permission(data.TableName(), p),
+		).Delete(&data, d.GetId())
+	if err := db.Error; err != nil {
+		e.Log.Errorf("Service RemoveLineReverseOrder error:%s \r\n", err)
+		return err
+	}
+	if db.RowsAffected == 0 {
+		return errors.New("无权删除该数据")
+	}
+	return nil
+}

app/admin/service/line_reverse_position.go

@@ -0,0 +1,324 @@
+package service
+
+import (
+	"errors"
+	"fmt"
+	"time"
+
+	"github.com/go-admin-team/go-admin-core/sdk/service"
+	"github.com/jinzhu/copier"
+	"github.com/shopspring/decimal"
+	"gorm.io/gorm"
+
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/actions"
+	cDto "go-admin/common/dto"
+	"go-admin/common/global"
+	"go-admin/pkg/utility"
+	"go-admin/pkg/utility/snowflakehelper"
+	"go-admin/services/binanceservice"
+	"go-admin/services/cacheservice"
+)
+
+type LineReversePosition struct {
+	service.Service
+}
+
+// 批量关闭仓位
+func (e LineReversePosition) ClosePositionBatch(req *dto.LineReversePositionCloseBatchReq, p *actions.DataPermission, userId int, errs *[]string) error {
+	var positions []models.LineReversePosition
+	var entity models.LineReversePosition
+	query := e.Orm.Model(&entity).
+		Scopes(
+			actions.Permission(entity.TableName(), p),
+		).
+		Where("reverse_status = 1 and position_side =?", req.PositionSide)
+
+	if len(req.Symbol) > 0 {
+		query = query.Where("symbol =?", req.Symbol)
+	}
+
+	if len(req.ReverseApiIds) > 0 {
+		query = query.Where("reverse_api_id in (?)", req.ReverseApiIds)
+	}
+
+	if err := query.Find(&positions).Error; err != nil {
+		e.Log.Errorf("LineReversePositionService ClosePositionBatch error:%s \r\n", err)
+		return err
+	}
+
+	if len(positions) == 0 {
+		return errors.New("没有需要关闭的仓位")
+	}
+
+	for _, position := range positions {
+		if err1 := e.Close(position); err1 != nil {
+			*errs = append(*errs, err1.Error())
+		}
+	}
+
+	return nil
+}
+
+// ClosePosition 关闭单个仓位
+func (e LineReversePosition) ClosePosition(req *dto.LineReversePositionCloseReq, p *actions.DataPermission, userId int) error {
+	var data models.LineReversePosition
+	err := e.Orm.Model(&data).
+		Scopes(
+			actions.Permission(data.TableName(), p),
+		).
+		Where("id =?", req.PositionId).First(&data).Error
+	if err != nil {
+		e.Log.Errorf("LineReversePositionService ClosePosition error:%s \r\n", err)
+		return err
+	}
+
+	err = e.Close(data)
+
+	return err
+}
+
+func (e *LineReversePosition) Close(data models.LineReversePosition) error {
+	if data.ReverseStatus != 1 {
+		return fmt.Errorf("%s-%s 仓位无法关闭", data.Symbol, data.PositionSide)
+	}
+
+	apiInfo, err := binanceservice.GetApiInfo(data.ReverseApiId)
+
+	if err != nil {
+		return fmt.Errorf("api %d不存在", data.ReverseApiId)
+	}
+	futApi := binanceservice.FutRestApi{}
+	futApiV2 := binanceservice.FuturesResetV2{}
+	holdData := binanceservice.HoldeData{}
+	err = futApi.GetPositionData(&apiInfo, data.Symbol, data.PositionSide, &holdData)
+
+	if err != nil {
+		return fmt.Errorf("获取币安持仓失败 %v", err)
+	}
+	setting, err := cacheservice.GetReverseSetting(e.Orm)
+
+	if err != nil {
+		return fmt.Errorf("获取反单设置失败")
+	}
+
+	symbol, err := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, data.Symbol, 0)
+
+	if err != nil {
+		return fmt.Errorf("获取%s的交易对信息失败", data.Symbol)
+	}
+
+	lastPrice, err := decimal.NewFromString(symbol.LastPrice)
+	if err != nil {
+		return fmt.Errorf("最新价格失败,%v", lastPrice)
+	}
+	side := ""
+	var price decimal.Decimal
+
+	if data.PositionSide == "LONG" {
+		side = "SELL"
+		price = decimal.NewFromInt(100).Sub(setting.ReversePremiumRatio).Div(decimal.NewFromInt(100)).Mul(lastPrice).Round(int32(symbol.PriceDigit))
+	} else {
+		side = "BUY"
+		price = decimal.NewFromInt(100).Add(setting.ReversePremiumRatio).Div(decimal.NewFromInt(100)).Mul(lastPrice).Round(int32(symbol.PriceDigit))
+	}
+
+	now := time.Now()
+	order := models.LineReverseOrder{
+		OrderSn:      snowflakehelper.GetOrderNo(),
+		PositionId:   data.Id,
+		PositionSide: data.PositionSide,
+		Symbol:       data.Symbol,
+		TotalNum:     holdData.TotalQuantity,
+		Category:     1,
+		OrderType:    4,
+		Side:         side,
+		Price:        price,
+		SignPrice:    lastPrice,
+		Type:         "LIMIT",
+		TriggerTime:  &now,
+		Status:       1,
+	}
+
+	if holdData.TotalQuantity.Cmp(decimal.Zero) > 0 {
+		if err := e.Orm.Create(&order).Error; err != nil {
+			return err
+		}
+		params := binanceservice.FutOrderPlace{
+			ApiId:            data.ReverseApiId,
+			Symbol:           data.Symbol,
+			Side:             order.Side,
+			PositionSide:     order.PositionSide,
+			Quantity:         order.TotalNum,
+			Price:            order.Price,
+			SideType:         order.Type,
+			OpenOrder:        0,
+			OrderType:        "LIMIT",
+			NewClientOrderId: order.OrderSn,
+		}
+
+		if err := futApiV2.OrderPlaceLoop(&apiInfo, params); err != nil {
+			e.Log.Errorf("币安下单失败 symbol:%s custom:%s :%v", params.Symbol, order.OrderSn, err)
+			if err1 := e.Orm.Model(&order).Where("status = 1").Updates(map[string]interface{}{"status": 8, "remark": err.Error(), "updated_at": time.Now()}).Error; err1 != nil {
+				e.Log.Errorf("更新订单状态失败 symbol:%s custom:%s :%v", params.Symbol, order.OrderSn, err1)
+				return err1
+			}
+
+			return err
+		}
+	} else {
+		order.Status = 8
+		order.Remark = "已经没有持仓"
+
+		err = e.Orm.Transaction(func(tx *gorm.DB) error {
+			if err1 := tx.Create(&order).Error; err1 != nil {
+				return err1
+			}
+
+			if err1 := tx.Model(&data).Where("reverse_status =1").Updates(map[string]interface{}{"reverse_status": 2, "updated_at": time.Now(), "reverse_amount": 0}).Error; err1 != nil {
+				return err1
+			}
+
+			return nil
+		})
+		if err != nil {
+			e.Log.Errorf("修改失败 %v", err)
+		}
+
+	}
+	return nil
+}
+
+// GetPage 获取LineReversePosition列表
+func (e *LineReversePosition) GetPage(c *dto.LineReversePositionGetPageReq, p *actions.DataPermission, list *[]dto.LineReversePositionListResp, count *int64) error {
+	var err error
+	var data models.LineReversePosition
+	var datas []models.LineReversePosition
+
+	err = e.Orm.Model(&data).
+		Scopes(
+			cDto.MakeCondition(c.GetNeedSearch()),
+			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
+			actions.Permission(data.TableName(), p),
+		).
+		Find(&datas).Limit(-1).Offset(-1).
+		Count(count).Error
+	if err != nil {
+		e.Log.Errorf("LineReversePositionService GetPage error:%s \r\n", err)
+		return err
+	}
+
+	userIds := make([]int, 0)
+
+	for _, item := range datas {
+		if !utility.ContainsInt(userIds, item.ApiId) {
+			userIds = append(userIds, item.ApiId)
+		}
+
+		if !utility.ContainsInt(userIds, item.ReverseApiId) {
+			userIds = append(userIds, item.ReverseApiId)
+		}
+	}
+
+	userMap := make(map[int]string, 0)
+
+	if len(userIds) > 0 {
+		var users []models.LineApiUser
+		e.Orm.Model(&models.LineApiUser{}).
+			Where("id IN (?)", userIds).
+			Find(&users)
+
+		for _, item := range users {
+			userMap[int(item.Id)] = item.ApiName
+		}
+	}
+
+	for _, item := range datas {
+		var resp dto.LineReversePositionListResp
+		copier.Copy(&resp, &item)
+
+		if userName, ok := userMap[item.ApiId]; ok {
+			resp.ApiName = userName
+		}
+
+		if userName, ok := userMap[item.ReverseApiId]; ok {
+			resp.ReverseApiName = userName
+		}
+
+		*list = append(*list, resp)
+	}
+	return nil
+}
+
+// Get 获取LineReversePosition对象
+func (e *LineReversePosition) Get(d *dto.LineReversePositionGetReq, p *actions.DataPermission, model *models.LineReversePosition) error {
+	var data models.LineReversePosition
+
+	err := e.Orm.Model(&data).
+		Scopes(
+			actions.Permission(data.TableName(), p),
+		).
+		First(model, d.GetId()).Error
+	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
+		err = errors.New("查看对象不存在或无权查看")
+		e.Log.Errorf("Service GetLineReversePosition error:%s \r\n", err)
+		return err
+	}
+	if err != nil {
+		e.Log.Errorf("db error:%s", err)
+		return err
+	}
+	return nil
+}
+
+// Insert 创建LineReversePosition对象
+func (e *LineReversePosition) Insert(c *dto.LineReversePositionInsertReq) error {
+	var err error
+	var data models.LineReversePosition
+	c.Generate(&data)
+	err = e.Orm.Create(&data).Error
+	if err != nil {
+		e.Log.Errorf("LineReversePositionService Insert error:%s \r\n", err)
+		return err
+	}
+	return nil
+}
+
+// Update 修改LineReversePosition对象
+func (e *LineReversePosition) Update(c *dto.LineReversePositionUpdateReq, p *actions.DataPermission) error {
+	var err error
+	var data = models.LineReversePosition{}
+	e.Orm.Scopes(
+		actions.Permission(data.TableName(), p),
+	).First(&data, c.GetId())
+	c.Generate(&data)
+
+	db := e.Orm.Save(&data)
+	if err = db.Error; err != nil {
+		e.Log.Errorf("LineReversePositionService Save error:%s \r\n", err)
+		return err
+	}
+	if db.RowsAffected == 0 {
+		return errors.New("无权更新该数据")
+	}
+	return nil
+}
+
+// Remove 删除LineReversePosition
+func (e *LineReversePosition) Remove(d *dto.LineReversePositionDeleteReq, p *actions.DataPermission) error {
+	var data models.LineReversePosition
+
+	db := e.Orm.Model(&data).
+		Scopes(
+			actions.Permission(data.TableName(), p),
+		).Delete(&data, d.GetId())
+	if err := db.Error; err != nil {
+		e.Log.Errorf("Service RemoveLineReversePosition error:%s \r\n", err)
+		return err
+	}
+	if db.RowsAffected == 0 {
+		return errors.New("无权删除该数据")
+	}
+	return nil
+}

app/admin/service/line_reverse_setting.go

@@ -0,0 +1,136 @@
+package service
+
+import (
+	"errors"
+
+	"github.com/go-admin-team/go-admin-core/sdk/service"
+	"gorm.io/gorm"
+
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/actions"
+	"go-admin/common/const/rediskey"
+	cDto "go-admin/common/dto"
+	"go-admin/common/helper"
+)
+
+type LineReverseSetting struct {
+	service.Service
+}
+
+// GetPage 获取LineReverseSetting列表
+func (e *LineReverseSetting) GetPage(c *dto.LineReverseSettingGetPageReq, p *actions.DataPermission, list *[]models.LineReverseSetting, count *int64) error {
+	var err error
+	var data models.LineReverseSetting
+
+	err = e.Orm.Model(&data).
+		Scopes(
+			cDto.MakeCondition(c.GetNeedSearch()),
+			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
+			actions.Permission(data.TableName(), p),
+		).
+		Find(list).Limit(-1).Offset(-1).
+		Count(count).Error
+	if err != nil {
+		e.Log.Errorf("LineReverseSettingService GetPage error:%s \r\n", err)
+		return err
+	}
+	return nil
+}
+
+// Get 获取LineReverseSetting对象
+func (e *LineReverseSetting) Get(d *dto.LineReverseSettingGetReq, p *actions.DataPermission, model *models.LineReverseSetting) error {
+	var data models.LineReverseSetting
+
+	err := e.Orm.Model(&data).
+		Scopes(
+			actions.Permission(data.TableName(), p),
+		).
+		First(model, d.GetId()).Error
+	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
+		err = errors.New("查看对象不存在或无权查看")
+		e.Log.Errorf("Service GetLineReverseSetting error:%s \r\n", err)
+		return err
+	}
+	if err != nil {
+		e.Log.Errorf("db error:%s", err)
+		return err
+	}
+	return nil
+}
+
+// Insert 创建LineReverseSetting对象
+func (e *LineReverseSetting) Insert(c *dto.LineReverseSettingInsertReq) error {
+	var err error
+	var data models.LineReverseSetting
+	c.Generate(&data)
+	err = e.Orm.Create(&data).Error
+	if err != nil {
+		e.Log.Errorf("LineReverseSettingService Insert error:%s \r\n", err)
+		return err
+	}
+
+	err = e.SaveCache(data)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// 缓存数据
+func (e *LineReverseSetting) SaveCache(data models.LineReverseSetting) error {
+	if data.Id == 0 {
+		if err := e.Orm.First(&data).Error; err != nil {
+			return err
+		}
+	}
+
+	if err := helper.DefaultRedis.SetHashWithTags(rediskey.ReverseSetting, &data); err != nil {
+		e.Log.Errorf("redis error:%s", err)
+		return err
+	}
+	return nil
+}
+
+// Update 修改LineReverseSetting对象
+func (e *LineReverseSetting) Update(c *dto.LineReverseSettingUpdateReq, p *actions.DataPermission) error {
+	var err error
+	var data = models.LineReverseSetting{}
+	e.Orm.Scopes(
+		actions.Permission(data.TableName(), p),
+	).First(&data, c.GetId())
+	c.Generate(&data)
+
+	db := e.Orm.Save(&data)
+	if err = db.Error; err != nil {
+		e.Log.Errorf("LineReverseSettingService Save error:%s \r\n", err)
+		return err
+	}
+	if db.RowsAffected == 0 {
+		return errors.New("无权更新该数据")
+	}
+	if err = helper.DefaultRedis.SetHashWithTags(rediskey.ReverseSetting, data); err != nil {
+		e.Log.Errorf("redis error:%s", err)
+		return err
+	}
+
+	return nil
+}
+
+// Remove 删除LineReverseSetting
+func (e *LineReverseSetting) Remove(d *dto.LineReverseSettingDeleteReq, p *actions.DataPermission) error {
+	var data models.LineReverseSetting
+
+	db := e.Orm.Model(&data).
+		Scopes(
+			actions.Permission(data.TableName(), p),
+		).Delete(&data, d.GetId())
+	if err := db.Error; err != nil {
+		e.Log.Errorf("Service RemoveLineReverseSetting error:%s \r\n", err)
+		return err
+	}
+	if db.RowsAffected == 0 {
+		return errors.New("无权删除该数据")
+	}
+	return nil
+}

app/admin/service/line_symbol.go

@@ -15,6 +15,7 @@ import (
 	"go-admin/app/admin/models"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/actions"
+	"go-admin/common/const/rediskey"
 	cDto "go-admin/common/dto"
 	"go-admin/common/global"
 	"go-admin/common/helper"
@@ -22,7 +23,6 @@ import (
 	models2 "go-admin/models"
 	"go-admin/pkg/utility"
 	"go-admin/services/binanceservice"
-	"go-admin/services/cacheservice"
 )
 
 type LineSymbol struct {
@@ -354,10 +354,9 @@ func (e *LineSymbol) ResetSpotSymbol() error {
 		Symbol string `json:"symbol"`
 		Price  string `json:"price"`
 	}
-	// tickerSymbol := helper.DefaultRedis.Get(rediskey.SpotSymbolTicker).Val()
-	// tickerSymbolMaps := make([]Ticker, 0)
-	// sonic.Unmarshal([]byte(tickerSymbol), &tickerSymbolMaps)
-	tickerSymbolMaps, _ := cacheservice.GetExchangeTradeSets(global.EXCHANGE_BINANCE, 1)
+	tickerSymbol := helper.DefaultRedis.Get(rediskey.SpotSymbolTicker).Val()
+	tickerSymbolMaps := make([]Ticker, 0)
+	sonic.Unmarshal([]byte(tickerSymbol), &tickerSymbolMaps)
 	oldMapSymbols, err := getMapSymbol(e, "1")
 	if err != nil {
 		return err
@@ -390,7 +389,7 @@ func (e *LineSymbol) ResetSpotSymbol() error {
 			var tickerPrice decimal.Decimal
 			for _, symbolMap := range tickerSymbolMaps {
 				if symbolMap.Symbol == strings.ToUpper(spotTicker24h.Currency+"USDT") {
-					tickerPrice, _ = decimal.NewFromString(symbolMap.LastPrice)
+					tickerPrice, _ = decimal.NewFromString(symbolMap.Price)
 				}
 			}
 			if tickerPrice.GreaterThan(decimal.Zero) {
@@ -528,10 +527,9 @@ func (e *LineSymbol) ResetFuturesSymbol() error {
 		Symbol string `json:"symbol"`
 		Price  string `json:"price"`
 	}
-	// tickerSymbol := helper.DefaultRedis.Get(rediskey.FutSymbolTicker).Val()
-	// tickerSymbolMaps := make([]Ticker, 0)
-	// sonic.Unmarshal([]byte(tickerSymbol), &tickerSymbolMaps)
-	tickerSymbolMaps, _ := cacheservice.GetExchangeTradeSets(global.EXCHANGE_BINANCE, 2)
+	tickerSymbol := helper.DefaultRedis.Get(rediskey.FutSymbolTicker).Val()
+	tickerSymbolMaps := make([]Ticker, 0)
+	sonic.Unmarshal([]byte(tickerSymbol), &tickerSymbolMaps)
 	oldMapSymbols, err := getMapSymbol(e, "2")
 	if err != nil {
 		return err
@@ -562,7 +560,7 @@ func (e *LineSymbol) ResetFuturesSymbol() error {
 			var tickerPrice decimal.Decimal
 			for _, symbolMap := range tickerSymbolMaps {
 				if symbolMap.Symbol == strings.ToUpper(spotTicker24h.Currency+"USDT") {
-					tickerPrice, _ = decimal.NewFromString(symbolMap.LastPrice)
+					tickerPrice, _ = decimal.NewFromString(symbolMap.Price)
 				}
 			}
 			if tickerPrice.GreaterThan(decimal.Zero) {

app/admin/service/line_user.go

@@ -18,7 +18,6 @@ import (
 	"go-admin/pkg/utility"
 	"go-admin/pkg/utility/seqs"
 	"go-admin/services/binanceservice"
-	"go-admin/services/cacheservice"
 	"strconv"
 	"strings"
 	"time"
@@ -324,13 +323,11 @@ func (e *LineUser) RechargeNetworkList(req *dto.RechargeListReq) (data []models.
 	}
 	coin := req.Coin
 	resp := make([]models.VtsCoinToNetWorkResp, 0)
-	// var tickerData []binanceservice.Ticker
-	// val := helper.DefaultRedis.Get(rediskey.SpotSymbolTicker).Val()
-	// if val != "" {
-	// 	sonic.Unmarshal([]byte(val), &tickerData)
-	// }
-
-	tickerData, _ := cacheservice.GetExchangeTradeSets(global.EXCHANGE_BINANCE, 1)
+	var tickerData []binanceservice.Ticker
+	val := helper.DefaultRedis.Get(rediskey.SpotSymbolTicker).Val()
+	if val != "" {
+		sonic.Unmarshal([]byte(val), &tickerData)
+	}
 
 	for _, v1 := range list {
 		if strings.EqualFold(coin, "USDT") {
@@ -360,7 +357,7 @@ func (e *LineUser) RechargeNetworkList(req *dto.RechargeListReq) (data []models.
 					TransferFee: utility.FloatCutStr(v1.TransferFee, 8),
 					//TransferFeeUsdt string `json:"transfer_fee_usdt"`
 				}
-				res.TransferFeeUsdt = utility.FloatCutStr(v1.TransferFee*utility.StringToFloat64(v2.LastPrice), 8)
+				res.TransferFeeUsdt = utility.FloatCutStr(v1.TransferFee*utility.StringToFloat64(v2.Price), 8)
 				resp = append(resp, res)
 			}
 		}

app/admin/service/line_user_setting.go

@@ -3,7 +3,7 @@ package service
 import (
 	"errors"
 
-    "github.com/go-admin-team/go-admin-core/sdk/service"
+	"github.com/go-admin-team/go-admin-core/sdk/service"
 	"gorm.io/gorm"
 
 	"go-admin/app/admin/models"
@@ -59,9 +59,9 @@ func (e *LineUserSetting) Get(d *dto.LineUserSettingGetReq, p *actions.DataPermi
 
 // Insert 创建LineUserSetting对象
 func (e *LineUserSetting) Insert(c *dto.LineUserSettingInsertReq) error {
-    var err error
-    var data models.LineUserSetting
-    c.Generate(&data)
+	var err error
+	var data models.LineUserSetting
+	c.Generate(&data)
 	err = e.Orm.Create(&data).Error
 	if err != nil {
 		e.Log.Errorf("LineUserSettingService Insert error:%s \r\n", err)
@@ -72,22 +72,22 @@ func (e *LineUserSetting) Insert(c *dto.LineUserSettingInsertReq) error {
 
 // Update 修改LineUserSetting对象
 func (e *LineUserSetting) Update(c *dto.LineUserSettingUpdateReq, p *actions.DataPermission) error {
-    var err error
-    var data = models.LineUserSetting{}
-    e.Orm.Scopes(
-            actions.Permission(data.TableName(), p),
-        ).First(&data, c.GetId())
-    c.Generate(&data)
+	var err error
+	var data = models.LineUserSetting{}
+	e.Orm.Scopes(
+		actions.Permission(data.TableName(), p),
+	).First(&data, c.GetId())
+	c.Generate(&data)
 
-    db := e.Orm.Save(&data)
-    if err = db.Error; err != nil {
-        e.Log.Errorf("LineUserSettingService Save error:%s \r\n", err)
-        return err
-    }
-    if db.RowsAffected == 0 {
-        return errors.New("无权更新该数据")
-    }
-    return nil
+	db := e.Orm.Save(&data)
+	if err = db.Error; err != nil {
+		e.Log.Errorf("LineUserSettingService Save error:%s \r\n", err)
+		return err
+	}
+	if db.RowsAffected == 0 {
+		return errors.New("无权更新该数据")
+	}
+	return nil
 }
 
 // Remove 删除LineUserSetting
@@ -99,11 +99,23 @@ func (e *LineUserSetting) Remove(d *dto.LineUserSettingDeleteReq, p *actions.Dat
 			actions.Permission(data.TableName(), p),
 		).Delete(&data, d.GetId())
 	if err := db.Error; err != nil {
-        e.Log.Errorf("Service RemoveLineUserSetting error:%s \r\n", err)
-        return err
-    }
-    if db.RowsAffected == 0 {
-        return errors.New("无权删除该数据")
-    }
+		e.Log.Errorf("Service RemoveLineUserSetting error:%s \r\n", err)
+		return err
+	}
+	if db.RowsAffected == 0 {
+		return errors.New("无权删除该数据")
+	}
 	return nil
 }
+
+// GetDefault 获取默认LineUserSetting对象
+func (e *LineUserSetting) GetDefault() (models.LineUserSetting, error) {
+	var data models.LineUserSetting
+
+	if err := e.Orm.Model(&data).First(&data).Error; err != nil {
+		e.Log.Errorf("GetDefault LineUserSetting error:%s \r\n", err)
+		return data, err
+	}
+
+	return data, nil
+}

app/jobs/account_job.go

@@ -0,0 +1,67 @@
+package jobs
+
+import (
+	binancedto "go-admin/models/binancedto"
+	"go-admin/services/binanceservice"
+
+	DbModels "go-admin/app/admin/models"
+
+	"github.com/go-admin-team/go-admin-core/logger"
+	"github.com/shopspring/decimal"
+)
+
+type BinanceSpotAccountJob struct{}
+
+type BinanceFuturesAccountJob struct{}
+
+// 币安账户划转
+func (t BinanceSpotAccountJob) Exec(arg interface{}) error {
+	db := getDefaultDb()
+	req := binancedto.BinanceTransfer{
+		Type:       "MAIN_UMFUTURE",
+		Asset:      "USDT",
+		Amount:     decimal.NewFromFloat(0.1),
+		FromSymbol: "USDT",
+		ToSymbol:   "USDT",
+	}
+	var apis []DbModels.LineApiUser
+
+	if err := db.Model(&DbModels.LineApiUser{}).Where("open_status = 1").Find(&apis).Error; err != nil {
+		return err
+	}
+
+	for _, apiUserInfo := range apis {
+		err := binanceservice.TradeAmount(db, &req, apiUserInfo)
+
+		if err != nil {
+			logger.Errorf("现货划转合约失败, err: %s", err)
+		}
+	}
+	return nil
+}
+
+// 币安账户划转
+func (t BinanceFuturesAccountJob) Exec(arg interface{}) error {
+	db := getDefaultDb()
+	req := binancedto.BinanceTransfer{
+		Type:       "UMFUTURE_MAIN",
+		Asset:      "USDT",
+		Amount:     decimal.NewFromFloat(0.1),
+		FromSymbol: "USDT",
+		ToSymbol:   "USDT",
+	}
+	var apis []DbModels.LineApiUser
+	if err := db.Model(&DbModels.LineApiUser{}).Where("open_status = 1").Find(&apis).Error; err != nil {
+		return err
+	}
+
+	for _, apiUserInfo := range apis {
+		err := binanceservice.TradeAmount(db, &req, apiUserInfo)
+
+		if err != nil {
+			logger.Errorf("合约划转现货失败, err: %s", err)
+		}
+	}
+
+	return nil
+}

app/jobs/account_job_test.go

@@ -0,0 +1,34 @@
+package jobs
+
+import (
+	"go-admin/common/helper"
+	"testing"
+
+	"github.com/go-admin-team/go-admin-core/sdk"
+	"gorm.io/driver/mysql"
+	"gorm.io/gorm"
+)
+
+func TestAccountJob(t *testing.T) {
+	dsn := "root:123456@tcp(127.0.0.1:3306)/go_exchange_single?charset=utf8mb4&parseTime=True&loc=Local&timeout=1000ms"
+	db, _ := gorm.Open(mysql.Open(dsn), &gorm.Config{})
+	sdk.Runtime.SetDb("default", db)
+
+	helper.InitDefaultRedis("127.0.0.1:6379", "", 2)
+	helper.InitLockRedisConn("127.0.0.1:6379", "", "2")
+
+	accountJob := BinanceSpotAccountJob{}
+	accountJob.Exec(nil)
+}
+
+func TestFutureAccountJob(t *testing.T) {
+	dsn := "root:123456@tcp(127.0.0.1:3306)/go_exchange_single?charset=utf8mb4&parseTime=True&loc=Local&timeout=1000ms"
+	db, _ := gorm.Open(mysql.Open(dsn), &gorm.Config{})
+	sdk.Runtime.SetDb("default", db)
+
+	helper.InitDefaultRedis("127.0.0.1:6379", "", 2)
+	helper.InitLockRedisConn("127.0.0.1:6379", "", "2")
+
+	accountJob := BinanceFuturesAccountJob{}
+	accountJob.Exec(nil)
+}

app/jobs/examples.go

@@ -9,8 +9,8 @@ import (
 	"go-admin/common/const/rediskey"
 	"go-admin/common/global"
 	"go-admin/common/helper"
-	"go-admin/models/positiondto"
 	"go-admin/pkg/utility"
+	"go-admin/services/binanceservice"
 	"time"
 
 	"github.com/bytedance/sonic"
@@ -38,6 +38,9 @@ func InitJob() {
 		"MemberExpirationJob":            MemberExpirationJob{},            //会员到期处理
 		"MemberRenwalOrderExpirationJob": MemberRenwalOrderExpirationJob{}, //会员续费订单过期处理
 		"TrxQueryJobs":                   TrxQueryJobs{},                   //订单支付监听
+		"StrategyJob":                    StrategyJob{},                    //下单策略触发
+		"BinanceSpotAccountJob":          BinanceSpotAccountJob{},          //币安现货划转
+		"BinanceFuturesAccountJob":       BinanceFuturesAccountJob{},       //币安合约划转
 	}
 }
 
@@ -128,10 +131,10 @@ func removeExpirateChildOrder(childOrders []models.LinePreOrder, db *gorm.DB) {
 	spotAdPositionStr, _ := helper.DefaultRedis.GetAllList(spotAddKey)
 	futReduceStr, _ := helper.DefaultRedis.GetAllList(futReduceKey)
 	spotReduceStr, _ := helper.DefaultRedis.GetAllList(spotReduceKey)
-	futAddPositionCache := positiondto.AddPositionList{}
-	spotAddPositionCache := positiondto.AddPositionList{}
-	futReduceCache := positiondto.ReduceListItem{}
-	spotReduceCache := positiondto.ReduceListItem{}
+	futAddPositionCache := binanceservice.AddPositionList{}
+	spotAddPositionCache := binanceservice.AddPositionList{}
+	futReduceCache := binanceservice.ReduceListItem{}
+	spotReduceCache := binanceservice.ReduceListItem{}
 	futAddPositionMap := map[int]string{}
 	spotAddPositionMap := map[int]string{}
 	futReduceMap := map[int]string{}

app/jobs/jobbase.go

@@ -3,6 +3,7 @@ package jobs
 import (
 	"fmt"
 	models2 "go-admin/app/jobs/models"
+	"runtime"
 	"time"
 
 	log "github.com/go-admin-team/go-admin-core/logger"
@@ -43,7 +44,10 @@ type ExecJob struct {
 func (e *ExecJob) Run() {
 	defer func() {
 		if err := recover(); err != nil {
-			log.Errorf("脚本任务失败:%v", err)
+			// 获取调用栈信息
+			buf := make([]byte, 1<<16) // 64KB 缓冲区
+			n := runtime.Stack(buf, false)
+			log.Errorf("脚本任务失败: %v\n%s", err, buf[:n])
 		}
 	}()
 

app/jobs/jobs.go

@@ -242,7 +242,7 @@ func (t LimitOrderTimeoutDuration) ReSpotOrderPlace(db *gorm.DB, order models.Li
 	} else {
 		var remainingQuantity decimal.Decimal
 		spotOrder, err := spotApi.GetOrderByOrderSnLoop(order.Symbol, order.OrderSn, apiUserinfo, 4)
-		tradeSet, _ := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, order.Symbol, 1)
+		tradeSet, _ := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, order.Symbol, 0)
 
 		if err == nil {
 			origQty := utility.StrToDecimal(spotOrder.OrigQty)
@@ -360,7 +360,7 @@ func (t LimitOrderTimeoutDuration) ReFutOrderPlace(db *gorm.DB, order models.Lin
 	} else {
 		var remainingQuantity decimal.Decimal
 		spotOrder, err := futApi.GetOrderByOrderSnLoop(order.Symbol, order.OrderSn, apiUserinfo, 4)
-		tradeSet, _ := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, order.Symbol, 2)
+		tradeSet, _ := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, order.Symbol, 1)
 
 		if err == nil {
 			origQty := utility.StrToDecimal(spotOrder.OrigQty)

app/jobs/strategy_job.go

@@ -0,0 +1,25 @@
+package jobs
+
+import (
+	"go-admin/common/global"
+	"go-admin/services/binanceservice"
+
+	"github.com/go-admin-team/go-admin-core/logger"
+	"github.com/go-admin-team/go-admin-core/sdk"
+)
+
+type StrategyJob struct {
+}
+
+// 策略下单任务
+func (j StrategyJob) Exec(arg interface{}) error {
+	strategyService := binanceservice.BinanceStrategyOrderService{}
+	db := getDefaultDb()
+	strategyService.Orm = db
+	strategyService.Log = logger.NewHelper(sdk.Runtime.GetLogger()).WithFields(map[string]interface{}{})
+
+	//触发币安策略下单
+	strategyService.TriggerStrategyOrder(global.EXCHANGE_BINANCE)
+
+	return nil
+}

app/jobs/strategy_job_test.go

@@ -1,22 +1,22 @@
-package test
+package jobs
 
 import (
 	"go-admin/common/helper"
-	"go-admin/config"
+	"testing"
 
 	"github.com/go-admin-team/go-admin-core/sdk"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 )
 
-func InitSettings() *gorm.DB {
+func TestStrategyJob(t *testing.T) {
 	dsn := "root:123456@tcp(127.0.0.1:3306)/go_exchange_single?charset=utf8mb4&parseTime=True&loc=Local&timeout=1000ms"
 	db, _ := gorm.Open(mysql.Open(dsn), &gorm.Config{})
 	sdk.Runtime.SetDb("default", db)
 	helper.InitDefaultRedis("127.0.0.1:6379", "", 2)
 	helper.InitLockRedisConn("127.0.0.1:6379", "", "2")
 
-	config.ExtConfig.ProxyUrl = "http://127.0.0.1:7890"
+	job := StrategyJob{}
 
-	return db
+	job.Exec([]string{})
 }

cmd/binance/binance.go

@@ -1,264 +0,0 @@
-package binance
-
-import (
-	"context"
-	"fmt"
-	"go-admin/app/admin/models"
-	"go-admin/app/admin/service"
-	"go-admin/common/const/rediskey"
-	"go-admin/common/database"
-	"go-admin/common/global"
-	"go-admin/common/helper"
-	"go-admin/common/storage"
-	"go-admin/config/serverinit"
-	"go-admin/pkg/httputils"
-	"go-admin/pkg/utility"
-	"go-admin/services/excservice"
-	"go-admin/services/fileservice"
-	"os"
-	"os/signal"
-	"strconv"
-	"time"
-
-	ext "go-admin/config"
-
-	"github.com/bytedance/sonic"
-	"github.com/go-admin-team/go-admin-core/config/source/file"
-	"github.com/go-admin-team/go-admin-core/logger"
-	"github.com/go-admin-team/go-admin-core/sdk"
-	"github.com/go-admin-team/go-admin-core/sdk/config"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg"
-	"github.com/spf13/cobra"
-	"gorm.io/gorm"
-)
-
-var (
-	configYml string
-	StartCmd  = &cobra.Command{
-		Use:          "binance",
-		Short:        "Start Binance service (market data + user private)",
-		Example:      "go-admin binance -c config/settings.yml",
-		SilenceUsage: true,
-		PreRun: func(cmd *cobra.Command, args []string) {
-			setup()
-		},
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return run()
-		},
-	}
-)
-
-func init() {
-	StartCmd.PersistentFlags().StringVarP(&configYml, "config", "c", "config/settings.yml", "Start server with provided configuration file")
-}
-
-func setup() {
-	// 注入配置扩展项
-	config.ExtendConfig = &ext.ExtConfig
-	//1. 读取配置
-	config.Setup(
-		file.NewSource(file.WithPath(configYml)),
-		database.Setup,
-		storage.Setup,
-	)
-	//注册监听函数
-	queue := sdk.Runtime.GetMemoryQueue("")
-	queue.Register(global.LoginLog, models.SaveLoginLog)
-	queue.Register(global.OperateLog, models.SaveOperaLog)
-	go queue.Run()
-
-	usageStr := `starting Binance service (market data + user private)...`
-	logger.Info(usageStr)
-}
-
-func run() error {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	var db *gorm.DB
-	dbs := sdk.Runtime.GetDb()
-
-	for _, item := range dbs {
-		db = item
-		break
-	}
-
-	defaultInit(db, ctx)
-
-	utility.SafeGo(func() {
-		// 启动定时任务
-		clearLogJob(db, ctx)
-	})
-
-	//自动重启websocket
-	// utility.SafeGo(func() {
-	// 	reconnect(ctx)
-	// })
-
-	//动态用户连接管理
-	utility.SafeGo(func() {
-		manageBinanceUserConnections(ctx)
-	})
-
-	// 等待中断信号以优雅地关闭服务器（设置 5 秒的超时时间）
-	quit := make(chan os.Signal, 1)
-	signal.Notify(quit, os.Interrupt)
-	<-quit
-
-	fmt.Printf("%s Shutdown Server ... \r\n", pkg.GetCurrentTimeStr())
-	logger.Infof("Server exiting")
-
-	return nil
-}
-
-func defaultInit(db *gorm.DB, ctx context.Context) {
-	httputils.InitProxy(ext.ExtConfig.ProxyUrl)
-	//初始化 默认redis
-	helper.InitDefaultRedis(ext.ExtConfig.Redis.Addr, ext.ExtConfig.Redis.Password, ext.ExtConfig.Redis.Db)
-	helper.InitLockRedisConn(ext.ExtConfig.Redis.Addr, ext.ExtConfig.Redis.Password, strconv.Itoa(ext.ExtConfig.Redis.Db))
-
-	err := helper.DefaultRedis.Ping()
-
-	if err != nil {
-		logger.Info("初始化redis失败!请检查配置")
-		_, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-		cancel()
-	} else {
-		logger.Info("redis初始化成功")
-	}
-
-	//初始化Binance服务（行情 + 用户私有）
-	logger.Info("=== 启动Binance完整服务 ===")
-
-	// 启动Binance行情服务
-	logger.Info("启动Binance行情服务...")
-	if err := serverinit.BinanceMarketInit(); err != nil {
-		logger.Infof("Binance行情服务启动失败: %v", err)
-	}
-
-	// 初始化Binance用户连接
-	logger.Info("启动Binance用户服务...")
-	initBinanceUserConnections(db, ctx)
-	logger.Info("=== Binance完整服务已启动 ===")
-}
-
-// 初始化Binance用户连接
-func initBinanceUserConnections(db *gorm.DB, ctx context.Context) {
-	var list []models.LineApiUser
-	err := db.Model(&models.LineApiUser{}).Where("open_status=1 AND exchange_type =?", global.EXCHANGE_BINANCE).Find(&list).Error
-
-	if err != nil {
-		logger.Info("获取Binance用户api失败: %v", err)
-		return
-	}
-
-	logger.Infof("找到 %d 个Binance用户，开始建立连接...", len(list))
-	for _, item := range list {
-		service.OpenUserBinanceWebsocket(item)
-	}
-}
-
-// 动态Binance用户连接管理
-func manageBinanceUserConnections(ctx context.Context) {
-	ticker := time.NewTicker(time.Second * 5)
-	defer ticker.Stop()
-
-	for {
-		select {
-		case <-ctx.Done():
-			logger.Info("Binance用户分组名称发送")
-			return
-		case <-ticker.C:
-			deleteKeys, _ := helper.DefaultRedis.GetAllList(rediskey.ApiUserDeleteList)
-			activeApis, _ := helper.DefaultRedis.GetAllList(rediskey.ApiUserActiveList)
-
-			//移除Binance连接
-			for _, item := range deleteKeys {
-				logger.Infof("移除Binance用户连接: %s", item)
-
-				if wm, ok := excservice.SpotSockets[item]; ok {
-					wm.Stop()
-					delete(excservice.SpotSockets, item)
-				}
-				if wm, ok := excservice.FutureSockets[item]; ok {
-					wm.Stop()
-					delete(excservice.FutureSockets, item)
-				}
-
-				if _, err := helper.DefaultRedis.LRem(rediskey.ApiUserDeleteList, item); err != nil {
-					logger.Errorf("移除待关闭websocket失败: %v", err)
-				}
-			}
-
-			//连接Binance用户websocket
-			var apiUser models.LineApiUser
-			for _, item := range activeApis {
-				if item == "" {
-					continue
-				}
-
-				if err := sonic.Unmarshal([]byte(item), &apiUser); err != nil {
-					logger.Errorf("解析用户信息失败: %v", err)
-					continue
-				}
-
-				// 只处理Binance用户
-				if apiUser.Id > 0 && apiUser.ExchangeType == global.EXCHANGE_BINANCE {
-					logger.Infof("为Binance用户 %d 建立连接", apiUser.Id)
-					service.OpenUserBinanceWebsocket(apiUser)
-
-					if _, err := helper.DefaultRedis.LRem(rediskey.ApiUserActiveList, item); err != nil {
-						logger.Errorf("删除待触发的apiUser失败: %v", err)
-					}
-				}
-			}
-		}
-	}
-}
-
-// 定时清理日志
-func clearLogJob(db *gorm.DB, ctx context.Context) {
-	ticker := time.NewTicker(time.Hour * 1)
-	defer ticker.Stop()
-
-	select {
-	case <-ctx.Done():
-		return
-	case <-ticker.C:
-		fileservice.ClearLogs(db)
-	}
-}
-
-// 定时重连websocket
-func reconnect(ctx context.Context) error {
-	ticker := time.NewTicker(time.Hour * 1)
-	defer ticker.Stop()
-
-	select {
-	case <-ctx.Done():
-		return nil
-	case <-ticker.C:
-		// 重启Binance连接
-		spotSockets := excservice.SpotSockets
-		futuresSockets := excservice.FutureSockets
-		timeOut := 22 * time.Hour
-
-		for _, item := range spotSockets {
-			if time.Since(item.ConnectTime) > timeOut {
-				if err := item.ReplaceConnection(); err != nil {
-					logger.Errorf("Binance现货重启连接失败 key:%s,error:%s", item.GetKey(), err)
-				}
-			}
-		}
-
-		for _, item := range futuresSockets {
-			if time.Since(item.ConnectTime) > timeOut {
-				if err := item.ReplaceConnection(); err != nil {
-					logger.Errorf("Binance合约重启连接失败 key:%s,error:%s", item.GetKey(), err)
-				}
-			}
-		}
-	}
-
-	return nil
-}

cmd/bitget/bitget.go

@@ -1,271 +0,0 @@
-package bitget
-
-import (
-	"context"
-	"fmt"
-	"go-admin/app/admin/models"
-	"go-admin/common/const/rediskey"
-	"go-admin/common/database"
-	"go-admin/common/global"
-	"go-admin/common/helper"
-	"go-admin/common/storage"
-	"go-admin/config/serverinit"
-	"go-admin/pkg/utility"
-	"go-admin/services/bitgetservice"
-	"go-admin/services/fileservice"
-	"os"
-	"os/signal"
-	"strconv"
-	"time"
-
-	ext "go-admin/config"
-
-	"github.com/bytedance/sonic"
-	"github.com/go-admin-team/go-admin-core/config/source/file"
-	"github.com/go-admin-team/go-admin-core/logger"
-	"github.com/go-admin-team/go-admin-core/sdk"
-	"github.com/go-admin-team/go-admin-core/sdk/config"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg"
-	"github.com/spf13/cobra"
-	"gorm.io/gorm"
-)
-
-var (
-	configYml string
-	StartCmd  = &cobra.Command{
-		Use:          "bitget",
-		Short:        "Start Bitget service (market data + user private)",
-		Example:      "go-admin bitget -c config/settings.yml",
-		SilenceUsage: true,
-		PreRun: func(cmd *cobra.Command, args []string) {
-			setup()
-		},
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return run()
-		},
-	}
-)
-
-func init() {
-	StartCmd.PersistentFlags().StringVarP(&configYml, "config", "c", "config/settings.yml", "Start server with provided configuration file")
-}
-
-func setup() {
-	// 注入配置扩展项
-	config.ExtendConfig = &ext.ExtConfig
-	//1. 读取配置
-	config.Setup(
-		file.NewSource(file.WithPath(configYml)),
-		database.Setup,
-		storage.Setup,
-	)
-	//注册监听函数
-	queue := sdk.Runtime.GetMemoryQueue("")
-	queue.Register(global.LoginLog, models.SaveLoginLog)
-	queue.Register(global.OperateLog, models.SaveOperaLog)
-	go queue.Run()
-
-	usageStr := `starting Bitget service (market data + user private)...`
-	logger.Info(usageStr)
-}
-
-func run() error {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	var db *gorm.DB
-	dbs := sdk.Runtime.GetDb()
-
-	for _, item := range dbs {
-		db = item
-		break
-	}
-
-	defaultInit(db, ctx)
-
-	utility.SafeGo(func() {
-		// 启动定时任务
-		clearLogJob(db, ctx)
-	})
-
-	//自动重启websocket
-	utility.SafeGo(func() {
-		reconnect(ctx)
-	})
-
-	//动态用户连接管理
-	utility.SafeGo(func() {
-		manageBitgetUserConnections(ctx)
-	})
-
-	// 等待中断信号以优雅地关闭服务器（设置 5 秒的超时时间）
-	quit := make(chan os.Signal, 1)
-	signal.Notify(quit, os.Interrupt)
-	<-quit
-
-	fmt.Printf("%s Shutdown Server ... \r\n", pkg.GetCurrentTimeStr())
-	logger.Info("Server exiting")
-
-	return nil
-}
-
-func defaultInit(db *gorm.DB, ctx context.Context) {
-	//初始化 默认redis
-	helper.InitDefaultRedis(ext.ExtConfig.Redis.Addr, ext.ExtConfig.Redis.Password, ext.ExtConfig.Redis.Db)
-	helper.InitLockRedisConn(ext.ExtConfig.Redis.Addr, ext.ExtConfig.Redis.Password, strconv.Itoa(ext.ExtConfig.Redis.Db))
-
-	err := helper.DefaultRedis.Ping()
-
-	if err != nil {
-		logger.Error("初始化redis失败!请检查配置")
-		_, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-		cancel()
-	} else {
-		logger.Info("redis初始化成功")
-	}
-
-	//初始化Bitget服务（行情 + 用户私有）
-	logger.Info("=== 启动Bitget完整服务 ===")
-
-	// 启动Bitget行情服务
-	logger.Info("启动Bitget行情服务...")
-	if err := serverinit.BitgetMarketInit(); err != nil {
-		logger.Errorf("Bitget行情服务启动失败: %v", err)
-	}
-
-	// 初始化Bitget用户连接
-	logger.Info("启动Bitget用户服务...")
-	initBitgetUserConnections(db, ctx)
-
-	logger.Info("=== Bitget完整服务已启动 ===")
-}
-
-// 初始化Bitget用户连接
-func initBitgetUserConnections(db *gorm.DB, ctx context.Context) {
-	var list []models.LineApiUser
-	err := db.Model(&models.LineApiUser{}).Where("open_status=1 AND exchange_type =?", global.EXCHANGE_BITGET).Find(&list).Error
-
-	if err != nil {
-		logger.Infof("获取Bitget用户api失败: %v", err)
-		return
-	}
-
-	logger.Infof("找到 %d 个Bitget用户，开始建立连接...", len(list))
-	for _, item := range list {
-		// 遵循私有WebSocket密钥传递规范：外部传入API密钥参数
-		createBitgetUserConnection(item)
-	}
-}
-
-// 创建Bitget用户连接（遵循密钥传递规范）
-func createBitgetUserConnection(apiUser models.LineApiUser) {
-	logger.Infof("为Bitget用户 %d 建立私有连接", apiUser.Id)
-
-	// 现货WebSocket (wsType=0)
-	spotManager := bitgetservice.GetOrCreateBitgetWebSocketManager(
-		0, // 现货
-		apiUser.ApiKey,
-		apiUser.ApiSecret,
-		apiUser.Passphrase,
-		"", // proxyType - 从配置获取
-		"", // proxyAddress - 从配置获取
-	)
-	spotManager.Start()
-
-	// 合约WebSocket (wsType=1)
-	futuresManager := bitgetservice.GetOrCreateBitgetWebSocketManager(
-		1, // 合约
-		apiUser.ApiKey,
-		apiUser.ApiSecret,
-		apiUser.Passphrase,
-		"", // proxyType
-		"", // proxyAddress
-	)
-	futuresManager.Start()
-
-	logger.Infof("Bitget用户 %d 私有连接已建立", apiUser.Id)
-}
-
-// 动态Bitget用户连接管理
-func manageBitgetUserConnections(ctx context.Context) {
-	ticker := time.NewTicker(time.Second * 5)
-	defer ticker.Stop()
-
-	for {
-		select {
-		case <-ctx.Done():
-			logger.Info("Bitget用户连接管理器退出")
-			return
-		case <-ticker.C:
-			deleteKeys, _ := helper.DefaultRedis.GetAllList(rediskey.ApiUserDeleteList)
-			activeApis, _ := helper.DefaultRedis.GetAllList(rediskey.ApiUserActiveList)
-
-			//移除Bitget连接
-			for _, item := range deleteKeys {
-				logger.Infof("移除Bitget用户连接: %s", item)
-
-				// 停止现货WebSocket
-				bitgetservice.StopBitgetWebSocketManager(0, item)
-				// 停止合约WebSocket
-				bitgetservice.StopBitgetWebSocketManager(1, item)
-
-				if _, err := helper.DefaultRedis.LRem(rediskey.ApiUserDeleteList, item); err != nil {
-					logger.Errorf("移除待关闭websocket失败: %v", err)
-				}
-			}
-
-			//连接Bitget用户websocket
-			var apiUser models.LineApiUser
-			for _, item := range activeApis {
-				if item == "" {
-					continue
-				}
-
-				if err := sonic.Unmarshal([]byte(item), &apiUser); err != nil {
-					logger.Errorf("解析用户信息失败: %v", err)
-					continue
-				}
-
-				// 只处理Bitget用户
-				if apiUser.Id > 0 && apiUser.ExchangeType == global.EXCHANGE_BITGET {
-					logger.Info("为Bitget用户 %d 建立连接", apiUser.Id)
-					createBitgetUserConnection(apiUser)
-
-					if _, err := helper.DefaultRedis.LRem(rediskey.ApiUserActiveList, item); err != nil {
-						logger.Errorf("删除待触发的apiUser失败: %v", err)
-					}
-				}
-			}
-		}
-	}
-}
-
-// 定时清理日志
-func clearLogJob(db *gorm.DB, ctx context.Context) {
-	ticker := time.NewTicker(time.Hour * 1)
-	defer ticker.Stop()
-
-	select {
-	case <-ctx.Done():
-		return
-	case <-ticker.C:
-		fileservice.ClearLogs(db)
-	}
-}
-
-// 定时重连websocket
-func reconnect(ctx context.Context) error {
-	ticker := time.NewTicker(time.Hour * 1)
-	defer ticker.Stop()
-
-	select {
-	case <-ctx.Done():
-		return nil
-	case <-ticker.C:
-		// 这里可以添加Bitget连接的重连逻辑
-		// 类似于Binance的重连机制
-		logger.Info("检查Bitget连接状态...")
-	}
-
-	return nil
-}

cmd/cobra.go

@@ -3,19 +3,19 @@ package cmd
 import (
 	"errors"
 	"fmt"
-	"go-admin/cmd/api"
 	"go-admin/cmd/app"
-	"go-admin/cmd/binance"
-	"go-admin/cmd/bitget"
-	"go-admin/cmd/config"
-	"go-admin/cmd/migrate"
 	"go-admin/cmd/usersubscribe"
-	"go-admin/cmd/version"
 	"go-admin/common/global"
 	"os"
 
 	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+
 	"github.com/spf13/cobra"
+
+	"go-admin/cmd/api"
+	"go-admin/cmd/config"
+	"go-admin/cmd/migrate"
+	"go-admin/cmd/version"
 )
 
 var rootCmd = &cobra.Command{
@@ -46,8 +46,6 @@ func tip() {
 func init() {
 	rootCmd.AddCommand(api.StartCmd)
 	rootCmd.AddCommand(usersubscribe.StartCmd)
-	rootCmd.AddCommand(binance.StartCmd)
-	rootCmd.AddCommand(bitget.StartCmd)
 	rootCmd.AddCommand(migrate.StartCmd)
 	rootCmd.AddCommand(version.StartCmd)
 	rootCmd.AddCommand(config.StartCmd)

cmd/usersubscribe/usersubscribe.go

@@ -90,6 +90,7 @@ func run() error {
 	utility.SafeGo(func() {
 		reconnect(ctx)
 	})
+
 	// 等待中断信号以优雅地关闭服务器（设置 5 秒的超时时间）
 	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, os.Interrupt)
@@ -152,3 +153,18 @@ func reconnect(ctx context.Context) error {
 
 	return nil
 }
+
+// StartDeadCheck 假死检测
+func StartDeadCheck(ctx context.Context) {
+	ticker := time.NewTicker(1 * time.Minute)
+	defer ticker.Stop()
+
+	for {
+		select {
+		case <-ctx.Done():
+			return
+		case <-ticker.C:
+			serverinit.DeadCheck()
+		}
+	}
+}

common/const/binancecode/event.go

@@ -0,0 +1,23 @@
+package binancecode
+
+// NEW
+// CANCELED 已撤
+// CALCULATED 订单 ADL 或爆仓
+// EXPIRED 订单失效
+// TRADE 交易
+// AMENDMENT 订单修改
+
+const (
+	//新开单
+	EVENT_NEW = "NEW"
+	//已撤单
+	EVENT_CANCELED = "CANCELED"
+	//订单 ADL 或爆仓
+	EVENT_CALCULATED = "CALCULATED"
+	//订单失效
+	EVENT_EXPIRED = "EXPIRED"
+	//交易中
+	EVENT_TRADE = "TRADE"
+	//订单修改
+	EVENT_AMENDMENT = "AMENDMENT"
+)

common/const/binancecode/order_type.go

@@ -0,0 +1,20 @@
+package binancecode
+
+const (
+	//限价单
+	ORDER_TYPE_LIMIT = "LIMIT"
+	//市价单
+	ORDER_TYPE_MARKET = "MARKET"
+	//止损限价单
+	ORDER_TYPE_STOP = "STOP"
+	//止损市价单
+	ORDER_TYPE_STOP_MARKET = "STOP_MARKET"
+	//止盈限价单
+	ORDER_TYPE_TAKE_PROFIT = "TAKE_PROFIT"
+	//止盈市价单
+	ORDER_TYPE_TAKE_PROFIT_MARKET = "TAKE_PROFIT_MARKET"
+	//跟踪止损单
+	ORDER_TYPE_TRAILING_STOP_MARKET = "TRAILING_STOP_MARKET"
+	//爆仓
+	ORDER_TYPE_LIQUIDATION = "LIQUIDATION"
+)

common/const/binancecode/side.go

@@ -0,0 +1,6 @@
+package binancecode
+
+const (
+	SideBuy  = "BUY"
+	SideSell = "SELL"
+)

common/const/rediskey/api_user.go

@@ -0,0 +1,6 @@
+package rediskey
+
+const (
+	//主单api和反单关系 List    {apiId}:{reverseApiId}
+	ApiReverseRelation = "api_reverse_relation"
+)

common/const/rediskey/redis_key.go

@@ -19,13 +19,11 @@ const (
 	PCRegisterMobile = "_PCRegisterMobile_%v" // 用户注册时手机key
 	PCResetPwdMobile = "_PCResetPwdMobile_%v" // 用户重置密码时手机key
 
-	// SpotSymbolTicker   = "_SpotSymbolTicker_"    // 现货交易对行情
-	// FutSymbolTicker    = "_FutSymbolTicker_"     // 合约交易对行情
-	PreOrderScriptList = "_ProOrderScriptList_" // 脚本执行list
-	// 待触发的现货订单集合{交易所类型 exchange_type}
-	PreSpotOrderList = "_PreSpotOrderList_:%s"
-	// 待触发的订单集合 {交易所类型 exchange_type}
-	PreFutOrderList = "_PreFutOrderList_:%s"
+	SpotSymbolTicker   = "_SpotSymbolTicker_"    // 现货交易对行情
+	FutSymbolTicker    = "_FutSymbolTicker_"     // 合约交易对行情
+	PreOrderScriptList = "_ProOrderScriptList_"  // 脚本执行list
+	PreSpotOrderList   = "_PreSpotOrderList_:%s" // 待触发的现货订单集合{交易所类型 exchange_type}
+	PreFutOrderList    = "_PreFutOrderList_:%s"  // 待触发的订单集合 {交易所类型 exchange_type}
 
 	//策略现货订单集合 {交易所类型 exchange_type}
 	StrategySpotOrderList = "strategy_spot_order_list:%s"
@@ -48,9 +46,9 @@ const (
 	SpotTrigger            = "spot_trigger_lock:%v_%s"        //现货触发 {apiuserid|symbol}
 	FutTrigger             = "fut_trigger_lock:%v_%s"         //合约触发 {apiuserid|symbol}
 
-	//波段现货触发{apiuserid|symbol}
+	//波段现货触发{apiuserid|ordersn}
 	StrategySpotTriggerLock = "strategy_spot_trigger_l:%v_%s"
-	//波段合约触发{apiuserid|symbol}
+	//波段合约触发{apiuserid|ordersn}
 	StrategyFutTriggerLock = "strategy_fut_trigger_l:%v_%s"
 
 	//减仓波段合约触发 {apiuserid|symbol}
@@ -97,9 +95,9 @@ const (
 )
 
 const (
-	//现货最后成交价 sort set {exchangeType,symbol}
+	//现货最后成交价 sort set key:={exchangeType,symbol}   content:={utc:price}
 	SpotTickerLastPrice = "spot_ticker_last_price:%s:%s"
-	//合约最后成交价 sort set {exchangeType,symbol}
+	//合约最后成交价 sort set {exchangeType,symbol}   content:={utc:price}
 	FutureTickerLastPrice = "fut_ticker_last_price:%s:%s"
 
 	//允许缓存交易对价格的交易对 list

common/const/rediskey/reverse_position.go

@@ -0,0 +1,11 @@
+package rediskey
+
+const (
+	//反单仓位管理 {apiKey} hash key
+	ReversePositionKey = "reverse_position:%s"
+)
+
+const (
+	//反单配置 hash {order_type} {take_profit_ratio} {stop_loss_ratio} {reverse_premium_ratio}
+	ReverseSetting = "reverse_setting"
+)

common/factory/exchange_factory.go

@@ -1,107 +0,0 @@
-package factory
-
-import (
-	"fmt"
-	"go-admin/common/global"
-	"go-admin/common/interfaces"
-	"strings"
-)
-
-// ExchangeFactory 交易所工厂
-type ExchangeFactory struct {
-	clients map[string]interfaces.ExchangeInterface
-}
-
-// NewExchangeFactory 创建交易所工厂实例
-func NewExchangeFactory() *ExchangeFactory {
-	return &ExchangeFactory{
-		clients: make(map[string]interfaces.ExchangeInterface),
-	}
-}
-
-// GetExchange 获取指定交易所的客户端
-func (f *ExchangeFactory) GetExchange(exchangeType string) (interfaces.ExchangeInterface, error) {
-	exchangeType = strings.ToLower(strings.TrimSpace(exchangeType))
-
-	// 检查是否已经创建了该交易所的客户端
-	if client, exists := f.clients[exchangeType]; exists {
-		return client, nil
-	}
-
-	// 根据交易所类型创建对应的客户端
-	var client interfaces.ExchangeInterface
-	var err error
-
-	switch exchangeType {
-	case global.EXCHANGE_BINANCE:
-		client, err = f.createBinanceClient()
-	case global.EXCHANGE_BITGET:
-		client, err = f.createBitgetClient()
-	case global.EXCHANGE_OKEX:
-		return nil, fmt.Errorf("OKEx integration not implemented yet")
-	case global.EXCHANGE_GATE:
-		return nil, fmt.Errorf("Gate.io integration not implemented yet")
-	case global.EXCHANGE_COINBASE:
-		return nil, fmt.Errorf("Coinbase integration not implemented yet")
-	case global.EXCHANGE_BITFINEX:
-		return nil, fmt.Errorf("Bitfinex integration not implemented yet")
-	case global.EXCHANGE_BITMEX:
-		return nil, fmt.Errorf("BitMEX integration not implemented yet")
-	default:
-		return nil, fmt.Errorf("unsupported exchange type: %s", exchangeType)
-	}
-
-	if err != nil {
-		return nil, fmt.Errorf("failed to create %s client: %v", exchangeType, err)
-	}
-
-	// 缓存客户端实例
-	f.clients[exchangeType] = client
-
-	return client, nil
-}
-
-// createBinanceClient 创建Binance客户端包装器
-func (f *ExchangeFactory) createBinanceClient() (interfaces.ExchangeInterface, error) {
-	// Binance适配器尚未完全实现，暴时返回错误
-	return nil, fmt.Errorf("Binance adapter not fully implemented yet")
-}
-
-// createBitgetClient 创建Bitget客户端
-func (f *ExchangeFactory) createBitgetClient() (interfaces.ExchangeInterface, error) {
-	// 使用默认空参数创建Bitget客户端（公开接口不需要认证）
-
-	return nil, fmt.Errorf("Bitget adapter not fully implemented yet")
-}
-
-// GetSupportedExchanges 获取支持的交易所列表
-func (f *ExchangeFactory) GetSupportedExchanges() []string {
-	return []string{
-		// global.EXCHANGE_BINANCE, // Binance适配器尚未完全实现
-		global.EXCHANGE_BITGET,
-		// 其他交易所可以在未来添加
-	}
-}
-
-// RegisterExchange 注册自定义交易所客户端
-func (f *ExchangeFactory) RegisterExchange(exchangeType string, client interfaces.ExchangeInterface) {
-	f.clients[strings.ToLower(exchangeType)] = client
-}
-
-// ClearCache 清理缓存的客户端
-func (f *ExchangeFactory) ClearCache() {
-	for _, client := range f.clients {
-		if closer, ok := client.(interface{ Close() error }); ok {
-			closer.Close()
-		}
-	}
-	f.clients = make(map[string]interfaces.ExchangeInterface)
-}
-
-// 全局工厂实例
-var DefaultExchangeFactory = NewExchangeFactory()
-
-// GetExchangeClient 获取交易所客户端的便捷函数
-func GetExchangeClient(exchangeType string) (interfaces.ExchangeInterface, error) {
-	return DefaultExchangeFactory.GetExchange(exchangeType)
-}

common/global/exchange.go

@@ -3,7 +3,6 @@ package global
 //交易所类型字典
 const (
 	EXCHANGE_BINANCE  = "binance"
-	EXCHANGE_BITGET   = "bitget"
 	EXCHANGE_OKEX     = "okex"
 	EXCHANGE_GATE     = "gate"
 	EXCHANGE_COINBASE = "coinbase"

common/global/redis_prefix.go

@@ -17,8 +17,8 @@ const (
 	K_SPOT = "k_spot"
 	//代币-配置
 	COIN_DETAIL = "c_spot_detail"
-	//代币-现货24h涨跌幅 {exchange}
-	COIN_PRICE_CHANGE = "c_spot_priceChange:%s"
+	//代币-现货24h涨跌幅
+	COIN_PRICE_CHANGE = "c_spot_priceChange"
 	//代币-现货热门排序
 	COIN_HOT_SORT = "c_spot_hot_sort"
 	//代币-现货新币排序

common/helper/bitgethttphelper.go

@@ -1,255 +0,0 @@
-package helper
-
-import (
-	"crypto"
-	"crypto/hmac"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/sha256"
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/base64"
-	"encoding/json"
-	"encoding/pem"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// BitgetClient Bitget HTTP客户端
-type BitgetClient struct {
-	APIKey     string
-	APISecret  string
-	Passphrase string
-	HTTPClient *http.Client
-	BaseURL    string
-	SignType   string
-}
-
-// NewBitgetClient 创建新的Bitget客户端
-func NewBitgetClient(apiKey, apiSecret, passphrase string, proxyUrl string) (*BitgetClient, error) {
-	var proxyType, proxyAddr string
-	if proxyUrl != "" {
-		if strings.HasPrefix(proxyUrl, "http://") {
-			proxyType = "http"
-			proxyAddr = proxyUrl
-		} else if strings.HasPrefix(proxyUrl, "https://") {
-			proxyType = "https"
-			proxyAddr = proxyUrl
-		} else if strings.HasPrefix(proxyUrl, "socks5://") {
-			proxyType = "socks5"
-			proxyAddr = proxyUrl
-		} else {
-			// 默认为http代理
-			proxyType = "http"
-			proxyAddr = "http://" + proxyUrl
-		}
-	}
-	// 创建HTTP客户端
-	client := &http.Client{
-		Transport: &http.Transport{
-			MaxIdleConns:    1000,
-			IdleConnTimeout: 10 * time.Second,
-			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-		},
-	}
-
-	// 设置代理
-	if proxyAddr != "" {
-		err := CreateHtppProxy(proxyType, proxyAddr, client)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return &BitgetClient{
-		APIKey:     apiKey,
-		APISecret:  apiSecret,
-		Passphrase: passphrase,
-		HTTPClient: client,
-		BaseURL:    "https://api.bitget.com",
-		SignType:   "SHA256",
-	}, nil
-}
-
-// DoGet 执行GET请求
-func (bc *BitgetClient) DoGet(uri string, params map[string]string) ([]byte, error) {
-	timestamp := bc.getTimestamp()
-	body := bc.buildGetParams(params)
-
-	sign := bc.sign("GET", uri, body, timestamp)
-	requestURL := bc.BaseURL + uri + body
-
-	request, err := http.NewRequest("GET", requestURL, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	bc.setHeaders(request, timestamp, sign)
-
-	response, err := bc.HTTPClient.Do(request)
-	if err != nil {
-		return nil, err
-	}
-	defer response.Body.Close()
-
-	return ioutil.ReadAll(response.Body)
-}
-
-// DoPost 执行POST请求
-func (bc *BitgetClient) DoPost(uri string, params interface{}) ([]byte, error) {
-	timestamp := bc.getTimestamp()
-
-	var body string
-	if params != nil {
-		bodyBytes, err := json.Marshal(params)
-		if err != nil {
-			return nil, err
-		}
-		body = string(bodyBytes)
-	}
-
-	sign := bc.sign("POST", uri, body, timestamp)
-	requestURL := bc.BaseURL + uri
-
-	request, err := http.NewRequest("POST", requestURL, strings.NewReader(body))
-	if err != nil {
-		return nil, err
-	}
-
-	bc.setHeaders(request, timestamp, sign)
-
-	response, err := bc.HTTPClient.Do(request)
-	if err != nil {
-		return nil, err
-	}
-	defer response.Body.Close()
-
-	return ioutil.ReadAll(response.Body)
-}
-
-// getTimestamp 获取时间戳
-func (bc *BitgetClient) getTimestamp() string {
-	return strconv.FormatInt(time.Now().Unix()*1000, 10)
-}
-
-// setHeaders 设置请求头
-func (bc *BitgetClient) setHeaders(request *http.Request, timestamp, sign string) {
-	request.Header.Add("Content-Type", "application/json")
-	request.Header.Add("ACCESS-KEY", bc.APIKey)
-	request.Header.Add("ACCESS-SIGN", sign)
-	request.Header.Add("ACCESS-TIMESTAMP", timestamp)
-	request.Header.Add("ACCESS-PASSPHRASE", bc.Passphrase)
-}
-
-// sign 生成签名
-func (bc *BitgetClient) sign(method, requestPath, body, timestamp string) string {
-	var payload strings.Builder
-	payload.WriteString(timestamp)
-	payload.WriteString(method)
-	payload.WriteString(requestPath)
-	if body != "" && body != "?" {
-		payload.WriteString(body)
-	}
-
-	if bc.SignType == "RSA" {
-		return bc.signByRSA(payload.String())
-	}
-
-	return bc.signByHMAC(payload.String())
-}
-
-// signByHMAC HMAC签名
-func (bc *BitgetClient) signByHMAC(payload string) string {
-	hash := hmac.New(sha256.New, []byte(bc.APISecret))
-	hash.Write([]byte(payload))
-	return base64.StdEncoding.EncodeToString(hash.Sum(nil))
-}
-
-// signByRSA RSA签名
-func (bc *BitgetClient) signByRSA(payload string) string {
-	sign, _ := bc.rsaSign([]byte(payload), []byte(bc.APISecret), crypto.SHA256)
-	return base64.StdEncoding.EncodeToString(sign)
-}
-
-// rsaSign RSA签名实现
-func (bc *BitgetClient) rsaSign(src []byte, priKey []byte, hash crypto.Hash) ([]byte, error) {
-	block, _ := pem.Decode(priKey)
-	if block == nil {
-		return nil, errors.New("key is invalid format")
-	}
-
-	var pkixPrivateKey interface{}
-	var err error
-	if block.Type == "RSA PRIVATE KEY" {
-		pkixPrivateKey, err = x509.ParsePKCS1PrivateKey(block.Bytes)
-	} else if block.Type == "PRIVATE KEY" {
-		pkixPrivateKey, err = x509.ParsePKCS8PrivateKey(block.Bytes)
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	h := hash.New()
-	_, err = h.Write(src)
-	if err != nil {
-		return nil, err
-	}
-
-	bytes := h.Sum(nil)
-	sign, err := rsa.SignPKCS1v15(rand.Reader, pkixPrivateKey.(*rsa.PrivateKey), hash, bytes)
-	if err != nil {
-		return nil, err
-	}
-
-	return sign, nil
-}
-
-// buildGetParams 构建GET请求参数
-func (bc *BitgetClient) buildGetParams(params map[string]string) string {
-	if len(params) == 0 {
-		return ""
-	}
-	return "?" + bc.sortParams(params)
-}
-
-// sortParams 参数排序
-func (bc *BitgetClient) sortParams(params map[string]string) string {
-	keys := make([]string, 0, len(params))
-	for k := range params {
-		keys = append(keys, k)
-	}
-	sort.Strings(keys)
-
-	sorted := make([]string, 0, len(params))
-	for _, k := range keys {
-		sorted = append(sorted, k+"="+params[k])
-	}
-	return strings.Join(sorted, "&")
-}
-
-// SendSpotRequestAuth 发送现货认证请求
-func (bc *BitgetClient) SendSpotRequestAuth(endpoint, method string, params map[string]interface{}) ([]byte, *http.Response, error) {
-	if method == "GET" {
-		paramStr := make(map[string]string)
-		for k, v := range params {
-			paramStr[k] = fmt.Sprintf("%v", v)
-		}
-		resp, err := bc.DoGet(endpoint, paramStr)
-		return resp, nil, err
-	} else {
-		resp, err := bc.DoPost(endpoint, params)
-		return resp, nil, err
-	}
-}
-
-// SendFuturesRequestAuth 发送合约认证请求
-func (bc *BitgetClient) SendFuturesRequestAuth(endpoint, method string, params map[string]interface{}) ([]byte, *http.Response, error) {
-	return bc.SendSpotRequestAuth(endpoint, method, params)
-}

common/helper/redis_helper.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/bytedance/sonic"
 	"github.com/go-redis/redis/v8"
+	"github.com/shopspring/decimal"
 )
 
 // RedisHelper 结构体封装了 Redis 客户端及上下文
@@ -460,44 +461,76 @@ func (r *RedisHelper) SetNX(key string, value interface{}, expiration time.Durat
 	return result == "OK", nil
 }
 
-func getFieldsFromStruct(obj interface{}) map[string]interface{} {
+// SetHashWithTags 改进版：支持 struct 或 map 输入
+func (r *RedisHelper) SetHashWithTags(key string, obj interface{}) error {
+	fields, err := getFieldsFromStruct(obj)
+	if err != nil {
+		return err
+	}
+
+	_, err = r.client.HSet(r.ctx, key, fields).Result()
+	return err
+}
+
+// getFieldsFromStruct 改进版：处理指针并进行类型检查，返回 error
+func getFieldsFromStruct(obj interface{}) (map[string]interface{}, error) {
 	fields := make(map[string]interface{})
 	val := reflect.ValueOf(obj)
-	typ := reflect.TypeOf(obj)
+
+	// 如果 obj 是指针，则解引用
+	if val.Kind() == reflect.Ptr {
+		val = val.Elem()
+	}
+
+	// 确保我们正在处理的是一个结构体
+	if val.Kind() != reflect.Struct {
+		return nil, fmt.Errorf("期望一个结构体或结构体指针，但得到的是 %s", val.Kind())
+	}
+
+	typ := val.Type() // 在解引用后获取类型
 
 	for i := 0; i < val.NumField(); i++ {
 		field := typ.Field(i)
-		tag := field.Tag.Get("redis")
+		tag := field.Tag.Get("redis") // 获取 redis tag
 		if tag != "" {
 			fieldVal := val.Field(i)
-			if fieldVal.Kind() == reflect.Slice || fieldVal.Kind() == reflect.Map {
+			// 检查字段是否可导出，不可导出的字段无法直接通过 Interface() 访问
+			if !fieldVal.CanInterface() {
+				continue // 跳过不可导出字段
+			}
+
+			switch fieldVal.Kind() {
+			case reflect.Slice, reflect.Map:
 				// 处理切片或映射类型
-				// 对于切片，使用索引作为字段名
 				if fieldVal.Kind() == reflect.Slice {
 					for j := 0; j < fieldVal.Len(); j++ {
 						elem := fieldVal.Index(j).Interface()
 						fields[fmt.Sprintf("%s_%d", tag, j)] = elem
 					}
 				} else if fieldVal.Kind() == reflect.Map {
-					// 对于映射，使用键作为字段名
 					for _, key := range fieldVal.MapKeys() {
 						elem := fieldVal.MapIndex(key).Interface()
 						fields[fmt.Sprintf("%s_%v", tag, key.Interface())] = elem
 					}
 				}
-			} else {
+			case reflect.Struct:
+				if fieldVal.Type() == reflect.TypeOf(decimal.Decimal{}) {
+					if decVal, ok := fieldVal.Interface().(decimal.Decimal); ok {
+						// 将 decimal.Decimal 直接转换为字符串来保留精度
+						fields[tag] = decVal.String()
+					} else {
+						// 理论上不应该发生，但作为回退
+						fields[tag] = fieldVal.Interface()
+					}
+				} else {
+					fields[tag] = fieldVal.Interface()
+				}
+			default:
 				fields[tag] = fieldVal.Interface()
 			}
 		}
 	}
-
-	return fields
-}
-
-func (r *RedisHelper) SetHashWithTags(key string, obj interface{}) error {
-	fields := getFieldsFromStruct(obj)
-	_, err := r.client.HSet(r.ctx, key, fields).Result()
-	return err
+	return fields, nil
 }
 
 // HSetField 设置哈希中的一个字段
@@ -543,6 +576,82 @@ func (r *RedisHelper) HGetAllFields(key string) (map[string]string, error) {
 	return fields, nil
 }
 
+// HGetAsObject 获取哈希中所有字段的值并反序列化为对象
+func (r *RedisHelper) HGetAsObject(key string, out interface{}) error {
+	data, err := r.HGetAllFields(key)
+	if err != nil {
+		return err
+	}
+
+	val := reflect.ValueOf(out)
+	if val.Kind() != reflect.Ptr || val.IsNil() {
+		return fmt.Errorf("output must be a non-nil pointer to a struct")
+	}
+	val = val.Elem()
+	typ := val.Type()
+
+	for i := 0; i < typ.NumField(); i++ {
+		field := typ.Field(i)
+		tag := field.Tag.Get("redis")
+		if tag == "" {
+			continue
+		}
+		strVal, ok := data[tag]
+		if !ok {
+			continue
+		}
+
+		fieldVal := val.Field(i)
+		if !fieldVal.CanSet() {
+			continue
+		}
+
+		switch fieldVal.Kind() {
+		case reflect.String:
+			fieldVal.SetString(strVal)
+		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+			if intVal, err := strconv.ParseInt(strVal, 10, 64); err == nil {
+				fieldVal.SetInt(intVal)
+			}
+		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+			if uintVal, err := strconv.ParseUint(strVal, 10, 64); err == nil {
+				fieldVal.SetUint(uintVal)
+			}
+		case reflect.Float32, reflect.Float64:
+			if floatVal, err := strconv.ParseFloat(strVal, 64); err == nil {
+				fieldVal.SetFloat(floatVal)
+			}
+		case reflect.Bool:
+			if boolVal, err := strconv.ParseBool(strVal); err == nil {
+				fieldVal.SetBool(boolVal)
+			}
+		case reflect.Struct:
+			// 针对 time.Time 特别处理
+			if fieldVal.Type() == reflect.TypeOf(time.Time{}) {
+				if t, err := time.Parse(time.RFC3339, strVal); err == nil {
+					fieldVal.Set(reflect.ValueOf(t))
+				}
+			} else if fieldVal.Type() == reflect.TypeOf(decimal.Decimal{}) {
+				if t, err := decimal.NewFromString(strVal); err == nil {
+					fieldVal.Set(reflect.ValueOf(t))
+				}
+			} else {
+				// 其他 struct 尝试用 json 反序列化
+				ptr := reflect.New(fieldVal.Type()).Interface()
+				if err := sonic.Unmarshal([]byte(strVal), ptr); err == nil {
+					fieldVal.Set(reflect.ValueOf(ptr).Elem())
+				}
+			}
+		case reflect.Slice, reflect.Map:
+			ptr := reflect.New(fieldVal.Type()).Interface()
+			if err := sonic.Unmarshal([]byte(strVal), ptr); err == nil {
+				fieldVal.Set(reflect.ValueOf(ptr).Elem())
+			}
+		}
+	}
+	return nil
+}
+
 // HDelField 删除哈希中的某个字段
 func (r *RedisHelper) HDelField(key, field string) error {
 	_, err := r.client.HDel(r.ctx, key, field).Result()

common/helper/redislock.go

@@ -106,6 +106,9 @@ func (rl *RedisLock) AcquireWait(ctx context.Context) (bool, error) {
 				baseInterval = time.Second
 			}
 
+			if baseInterval <= 0 {
+				baseInterval = time.Millisecond * 100 // 至少 100ms
+			}
 			// 随机退避
 			retryInterval := time.Duration(rand.Int63n(int64(baseInterval))) // 随机退避
 			if retryInterval < time.Millisecond*100 {
@@ -129,6 +132,13 @@ func (rl *RedisLock) AcquireWait(ctx context.Context) (bool, error) {
 	return false, ErrFailed
 }
 
+func safeRandomDuration(max time.Duration) time.Duration {
+	if max <= 0 {
+		return 100 * time.Millisecond // fallback default
+	}
+	return time.Duration(rand.Int63n(int64(max)))
+}
+
 // Release 释放锁
 func (rl *RedisLock) Release() (bool, error) {
 	return rl.releaseCtx(context.Background())

common/interfaces/exchange.go

@@ -1,170 +0,0 @@
-package interfaces
-
-import (
-	"go-admin/models"
-
-	"github.com/shopspring/decimal"
-)
-
-// ExchangeInterface 交易所通用接口抽象层
-type ExchangeInterface interface {
-	// 基础信息接口
-	GetExchangeName() string
-	GetExchangeInfo() (ExchangeInfoResponse, error)
-
-	// 现货市场接口
-	SpotInterface
-
-	// 合约接口（如果支持）
-	FuturesInterface
-
-	// WebSocket接口
-	WebSocketInterface
-}
-
-// SpotInterface 现货交易接口
-type SpotInterface interface {
-	// 市场数据
-	GetSpotTicker24h(symbol string) (models.Ticker24, error)
-	GetSpotTickers() ([]models.TradeSet, error)
-	// 订单管理
-	PlaceSpotOrder(params SpotOrderParams) (SpotOrderResponse, error)
-	CancelSpotOrder(symbol, orderID string) error
-	GetSpotOrder(symbol, orderID string) (SpotOrderResponse, error)
-	GetSpotOrders(symbol string) ([]SpotOrderResponse, error)
-}
-
-// FuturesInterface 合约交易接口
-type FuturesInterface interface {
-	// 市场数据
-	GetFuturesTicker24h(symbol string) (models.Ticker24, error)
-	GetFuturesTickers() ([]models.TradeSet, error)
-	// 订单管理
-	PlaceFuturesOrder(params FuturesOrderParams) (FuturesOrderResponse, error)
-	CancelFuturesOrder(symbol, orderID string) error
-	GetFuturesOrder(symbol, orderID string) (FuturesOrderResponse, error)
-}
-
-// WebSocketInterface WebSocket接口
-type WebSocketInterface interface {
-	SubscribeSpotTicker(symbols []string, callback func(models.Ticker24, string, string)) error
-	SubscribeFuturesTicker(symbols []string, callback func(models.Ticker24, string, string)) error
-	SubscribeSpotDepth(symbols []string, callback func(models.DepthBin, string, string)) error
-	SubscribeSpotTrades(symbols []string, callback func(models.NewDealPush, string, string)) error
-	SubscribeKline(symbols []string, interval string, callback func(models.Kline, int, string, string)) error
-
-	Close() error
-}
-
-// 通用数据结构定义
-type ExchangeInfoResponse struct {
-	Symbols []SymbolInfo `json:"symbols"`
-}
-
-type SymbolInfo struct {
-	Symbol      string `json:"symbol"`
-	BaseAsset   string `json:"baseAsset"`
-	QuoteAsset  string `json:"quoteAsset"`
-	Status      string `json:"status"`
-	MinQty      string `json:"minQty"`
-	MaxQty      string `json:"maxQty"`
-	StepSize    string `json:"stepSize"`
-	MinPrice    string `json:"minPrice"`
-	MaxPrice    string `json:"maxPrice"`
-	TickSize    string `json:"tickSize"`
-	MinNotional string `json:"minNotional"`
-}
-
-// 现货订单参数
-type SpotOrderParams struct {
-	Symbol           string          `json:"symbol"`
-	Side             string          `json:"side"` // BUY/SELL
-	Type             string          `json:"type"` // MARKET/LIMIT
-	Quantity         decimal.Decimal `json:"quantity"`
-	Price            decimal.Decimal `json:"price,omitempty"`
-	TimeInForce      string          `json:"timeInForce,omitempty"` // GTC/IOC/FOK
-	NewClientOrderId string          `json:"newClientOrderId,omitempty"`
-}
-
-// 合约订单参数
-type FuturesOrderParams struct {
-	Symbol           string          `json:"symbol"`
-	Side             string          `json:"side"` // BUY/SELL
-	Type             string          `json:"type"` // MARKET/LIMIT
-	Quantity         decimal.Decimal `json:"quantity"`
-	Price            decimal.Decimal `json:"price,omitempty"`
-	TimeInForce      string          `json:"timeInForce,omitempty"`
-	PositionSide     string          `json:"positionSide,omitempty"` // LONG/SHORT/BOTH
-	NewClientOrderId string          `json:"newClientOrderId,omitempty"`
-}
-
-// 响应数据结构
-type SpotAccountResponse struct {
-	Balances []SpotBalanceResponse `json:"balances"`
-}
-
-type SpotBalanceResponse struct {
-	Asset  string `json:"asset"`
-	Free   string `json:"free"`
-	Locked string `json:"locked"`
-}
-
-type SpotOrderResponse struct {
-	Symbol        string `json:"symbol"`
-	OrderId       int64  `json:"orderId"`
-	ClientOrderId string `json:"clientOrderId"`
-	Price         string `json:"price"`
-	OrigQty       string `json:"origQty"`
-	ExecutedQty   string `json:"executedQty"`
-	Status        string `json:"status"`
-	TimeInForce   string `json:"timeInForce"`
-	Type          string `json:"type"`
-	Side          string `json:"side"`
-	Time          int64  `json:"time"`
-	UpdateTime    int64  `json:"updateTime"`
-}
-
-type FuturesAccountResponse struct {
-	TotalWalletBalance string                    `json:"totalWalletBalance"`
-	Assets             []FuturesBalanceResponse  `json:"assets"`
-	Positions          []FuturesPositionResponse `json:"positions"`
-}
-
-type FuturesBalanceResponse struct {
-	Asset                  string `json:"asset"`
-	WalletBalance          string `json:"walletBalance"`
-	UnrealizedProfit       string `json:"unrealizedProfit"`
-	MarginBalance          string `json:"marginBalance"`
-	MaintMargin            string `json:"maintMargin"`
-	InitialMargin          string `json:"initialMargin"`
-	PositionInitialMargin  string `json:"positionInitialMargin"`
-	OpenOrderInitialMargin string `json:"openOrderInitialMargin"`
-}
-
-type FuturesPositionResponse struct {
-	Symbol           string `json:"symbol"`
-	PositionAmt      string `json:"positionAmt"`
-	EntryPrice       string `json:"entryPrice"`
-	MarkPrice        string `json:"markPrice"`
-	UnrealizedProfit string `json:"unrealizedProfit"`
-	LiquidationPrice string `json:"liquidationPrice"`
-	Leverage         string `json:"leverage"`
-	PositionSide     string `json:"positionSide"`
-}
-
-type FuturesOrderResponse struct {
-	Symbol        string `json:"symbol"`
-	OrderId       int64  `json:"orderId"`
-	ClientOrderId string `json:"clientOrderId"`
-	Price         string `json:"price"`
-	OrigQty       string `json:"origQty"`
-	ExecutedQty   string `json:"executedQty"`
-	Status        string `json:"status"`
-	TimeInForce   string `json:"timeInForce"`
-	Type          string `json:"type"`
-	Side          string `json:"side"`
-	PositionSide  string `json:"positionSide"`
-	ReduceOnly    bool   `json:"reduceOnly"`
-	Time          int64  `json:"time"`
-	UpdateTime    int64  `json:"updateTime"`
-}

config/extend.go

@@ -14,6 +14,7 @@ type Extend struct {
 	Redis           RedisConfig     `mapstructure:"redis"`
 	ServiceId       int64           `mapstructure:"serviceId"` //雪花算法id（服务id，比如1,2,3等，当多机部署需定义唯一id）
 	EmailConfig     EmailConfig     `mapstructure:"emailConfig"`
+	BinanceSet      BinanceConfig   `mapstructure:"binanceSet"` //binance配置
 	Domain          string          //网站域名
 	UDunConfig      UDunConfig      `mapstructure:"UDunConfig"`
 	ProxyUrl        string          //代理地址
@@ -57,6 +58,12 @@ type EmailSend struct {
 	To      string `json:"to"`      // 收件地址
 }
 
+// BinanceConfig 币安路由配置
+type BinanceConfig struct {
+	SpotRestURL string
+	FutRestURL  string
+}
+
 type GoToneSmsConfig struct {
 	SenderId      string `json:"sender_id"`
 	APIEndpoint   string `json:"api_endpoint"`
@@ -75,14 +82,3 @@ type UDunConfig struct {
 	UDunKey        string `json:"UDunKey"`
 	CurrServerIp   string `json:"CurrServerIp"`
 }
-
-/**
- * Binance配置结构体
- */
-type BinanceConfig struct {
-	ApiKey       string `json:"apiKey" mapstructure:"apiKey"`             // API密钥
-	ApiSecret    string `json:"apiSecret" mapstructure:"apiSecret"`       // API密钥
-	ProxyType    string `json:"proxyType" mapstructure:"proxyType"`       // 代理类型
-	ProxyAddress string `json:"proxyAddress" mapstructure:"proxyAddress"` // 代理地址
-	TestNet      bool   `json:"testNet" mapstructure:"testNet"`           // 是否使用测试网
-}

config/serverinit/binance_futures_init.go

@@ -5,6 +5,7 @@ import (
 	"go-admin/models"
 	"go-admin/pkg/httputils"
 	"go-admin/services/binanceservice"
+	"go-admin/services/futureservice"
 
 	log "github.com/go-admin-team/go-admin-core/logger"
 	"github.com/robfig/cron/v3"
@@ -32,6 +33,9 @@ func FuturesInit() error {
 	}
 	log.Info("初始化24h行情-结束")
 
+	log.Info("订阅合约-开始")
+	go futureservice.StartBinanceProWs("normal")
+
 	//定时任务
 	RunJobs()
 	return nil

config/serverinit/bitget_init.go

@@ -1,144 +0,0 @@
-package serverinit
-
-import (
-	"go-admin/config"
-	"go-admin/models"
-	"go-admin/pkg/httputils"
-	"go-admin/pkg/utility"
-	"go-admin/services/bitgetservice"
-
-	log "github.com/go-admin-team/go-admin-core/logger"
-	"github.com/robfig/cron/v3"
-)
-
-// BitgetInit 初始化Bitget交易所
-func BitgetMarketInit() error {
-	// 设置代理（如果配置了的话）
-	httputils.InitProxy(config.ExtConfig.ProxyUrl)
-
-	log.Info("初始化Bitget交易对-开始")
-	spotData := make(map[string]models.TradeSet, 0)
-	futData := make(map[string]models.TradeSet, 0)
-	err := bitgetservice.GetAndReloadSymbols(&spotData, 1)
-
-	if err != nil {
-		log.Error("初始化Bitget交易对失败，可能是网络问题，将跳过初始化:", err)
-		// 不返回错误，允许程序继续运行
-		return nil
-	}
-
-	err = bitgetservice.GetAndReloadSymbols(&futData, 2)
-	if err != nil {
-		log.Error("初始化Bitget合约交易对失败，可能是网络问题，将跳过初始化:", err)
-		// 不返回错误，允许程序继续运行
-		return nil
-	}
-
-	log.Info("初始化Bitget交易对-结束")
-
-	log.Info("初始化Bitget 24h行情-开始")
-	_, err = bitgetservice.InitSymbolsTicker24h(&spotData, 1)
-
-	if err != nil {
-		log.Error("初始化Bitget 24h行情失败，可能是网络问题，将跳过初始化:", err)
-		// 不返回错误，允许程序继续运行
-		return nil
-	}
-
-	_, err = bitgetservice.InitSymbolsTicker24h(&futData, 2)
-	if err != nil {
-		log.Error("初始化Bitget合约24h行情失败，可能是网络问题，将跳过初始化:", err)
-		// 不返回错误，允许程序继续运行
-		return nil
-	}
-	log.Info("初始化Bitget 24h行情-结束")
-
-	//现货行情订阅
-	spotSymbols := []string{}
-	for k, _ := range spotData {
-		spotSymbols = append(spotSymbols, k)
-	}
-	spotMaps := utility.SplitSlice(spotSymbols, 50)
-	bitgetSpot := bitgetservice.BitgetMarketSpotClient{}
-
-	for _, v := range spotMaps {
-		if err := bitgetSpot.Subscribe(v); err != nil {
-			log.Error("订阅Bitget现货行情失败", err)
-			return err
-		}
-	}
-
-	//合约行情订阅
-	futSymbols := []string{}
-	for k, _ := range futData {
-		futSymbols = append(futSymbols, k)
-	}
-	futMaps := utility.SplitSlice(futSymbols, 50)
-	bitgetFut := bitgetservice.BitgetMarketFutureClient{}
-
-	for _, v := range futMaps {
-		if err := bitgetFut.Subscribe(v); err != nil {
-			log.Error("订阅Bitget合约行情失败", err)
-			return err
-		}
-	}
-
-	// 启动定时任务
-	runBitgetJobs()
-
-	return nil
-}
-
-// runBitgetJobs 启动Bitget相关的定时任务
-func runBitgetJobs() {
-	cronJob := cron.New()
-
-	// 每小时更新一次交易对信息
-	_, err := cronJob.AddFunc("@every 1h", func() {
-		log.Info("执行Bitget交易对更新任务")
-		data := make(map[string]models.TradeSet, 0)
-		if err := bitgetservice.GetAndReloadSymbols(&data, 1); err != nil {
-			log.Error("更新Bitget交易对失败", err)
-		}
-	})
-
-	if err != nil {
-		log.Error("添加Bitget交易对更新任务失败", err)
-	} else {
-		log.Info("添加Bitget交易对更新任务成功")
-	}
-
-	// 启动定时任务
-	cronJob.Start()
-	log.Info("Bitget定时任务启动完成")
-}
-
-// CreateBitgetPrivateWebSocket 创建Bitget私有WebSocket连接的示例函数
-func CreateBitgetPrivateWebSocket(apiKey, apiSecret, passphrase, proxyType, proxyAddress string) {
-	log.Info("创建Bitget私有WebSocket连接 key:", apiKey)
-
-	// 现货WebSocket (wsType=0)
-	spotManager := bitgetservice.GetOrCreateBitgetWebSocketManager(
-		0, apiKey, apiSecret, passphrase, proxyType, proxyAddress)
-	spotManager.Start()
-
-	// 合约WebSocket (wsType=1)
-	futuresManager := bitgetservice.GetOrCreateBitgetWebSocketManager(
-		1, apiKey, apiSecret, passphrase, proxyType, proxyAddress)
-	futuresManager.Start()
-
-	log.Info("Bitget私有WebSocket连接已创建")
-}
-
-// StopBitgetPrivateWebSocket 停止Bitget私有WebSocket连接的示例函数
-func StopBitgetPrivateWebSocket(apiKey string) {
-	log.Info("停止Bitget私有WebSocket连接 key:", apiKey)
-
-	// 停止现货WebSocket
-	bitgetservice.StopBitgetWebSocketManager(0, apiKey)
-
-	// 停止合约WebSocket
-	bitgetservice.StopBitgetWebSocketManager(1, apiKey)
-
-	log.Info("Bitget私有WebSocket连接已停止")
-}

config/serverinit/business_init.go

@@ -8,10 +8,12 @@ import (
 	"go-admin/common/helper"
 	"go-admin/config"
 	"go-admin/pkg/httputils"
+	"go-admin/services/binanceservice"
 	"go-admin/services/cacheservice"
 	"go-admin/services/futureservice"
 	"go-admin/services/scriptservice"
 	"os"
+	"time"
 
 	"github.com/bytedance/sonic"
 	"github.com/go-admin-team/go-admin-core/logger"
@@ -28,6 +30,24 @@ func BusinessInit(db *gorm.DB) {
 		os.Exit(-1)
 	}
 
+	lineApiService := service.LineApiUser{}
+	lineApiService.Orm = db
+	lineApiService.Log = logger.NewHelper(sdk.Runtime.GetLogger()).WithFields(map[string]interface{}{})
+
+	if err := lineApiService.CacheRelation(); err != nil {
+		lineApiService.Log.Errorf("初始化api关系失败 err:%v", err)
+		os.Exit(-1)
+	}
+
+	reverseSettingService := service.LineReverseSetting{}
+	reverseSettingService.Orm = db
+	reverseSettingService.Log = lineApiService.Log
+
+	if err := reverseSettingService.SaveCache(models.LineReverseSetting{}); err != nil {
+		reverseSettingService.Log.Errorf("初始化反单设置失败 err:%v", err)
+		os.Exit(-1)
+	}
+
 	//初始化参数配置
 	cacheservice.InitConfigCache(db)
 	//初始化可缓存价格交易对
@@ -36,6 +56,9 @@ func BusinessInit(db *gorm.DB) {
 	symbolPriceService.Log = logger.NewHelper(sdk.Runtime.GetLogger()).WithFields(map[string]interface{}{})
 	symbolPriceService.InitCache()
 
+	//清理交易对缓存价格
+	clearSymbolPrice()
+
 	//初始化订单配置
 	cacheservice.ResetSystemSetting(db)
 	lineApiUser := service.LineApiUser{}
@@ -45,34 +68,54 @@ func BusinessInit(db *gorm.DB) {
 		os.Exit(-1)
 	}
 
+	//币安 现货交易对
+	SpotCurrencyInit()
+	//币安 合约交易对
+	FuturesInit()
+
+	//第一次初始化交易对价格
+	spotApi := binanceservice.SpotRestApi{}
+	futApi := binanceservice.FutRestApi{}
+	spotApi.Ticker()
+	futApi.Ticker()
+
+	//现货 订阅
+	SpotSubscribeInit("normal")
+	//合约订阅
+	futureservice.StartBinanceProWs("normal")
 	//定时任务
 	RunSpotJobs(db)
 }
 
-// 行情监听初始化
-func BinanceMarketInit() error {
-	//币安 现货交易对（仅数据初始化，不启动WebSocket）
-	SpotCurrencyInit()
-	//币安 合约交易对（仅数据初始化，不启动WebSocket）
-	FuturesInit()
-
-	//现货 订阅
-	// SpotSubscribeInit("normal")
-	//合约订阅
-	futureservice.StartBinanceProWs("normal")
-	// log.Info("订阅合约-开始")
-	// go futureservice.StartBinanceProWs("normal")
-
-	return nil
-}
-
 // 开启现货ws监听
 func SpotWsInit() {
+	//启动websocket服务
+	//go func() {
+	//	err := wsservice.StartServer(":3333")
+	//	if err != nil {
+	//		log.Info("wsservice.StartServer", zap.Error(err))
+	//
+	//		_, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	//		cancel()
+	//	}
+	//}()
 }
 
 // 定义任务
 func RunSpotJobs(db *gorm.DB) {
 	cronJob := cron.New()
+	//添加任务 同步交易对行情
+	// spotApi := spotservice.SpotRestApi{}
+	// futApi := futureservice.FutRestApi{}
+	// _, err := cronJob.AddFunc("@every 10s", func() {
+	// 	//BuySellOrderNew(db)
+	// spotApi.Ticker()
+	// futApi.Ticker()
+	// })
+	// if err != nil {
+	// 	return
+	// }
+
 	//定时执行脚本任务
 	_, err := cronJob.AddFunc("@every 3s", func() {
 		order := scriptservice.PreOrder{}
@@ -124,3 +167,24 @@ func loadApiUser(db *gorm.DB) error {
 
 	return nil
 }
+
+// 清理交易对价格缓存
+func clearSymbolPrice() error {
+	spotAll, _ := helper.DefaultRedis.ScanKeys("spot_ticker_last_price:*")
+	futAllKey, _ := helper.DefaultRedis.ScanKeys("fut_ticker_last_price:*")
+	beforeTimeUtc := time.Now().UnixMilli()
+
+	for _, item := range spotAll {
+		if _, err := helper.DefaultRedis.RemoveBeforeScore(item, float64(beforeTimeUtc)); err != nil {
+			logger.Error("现货 清理交易对价格缓存失败：", err)
+		}
+	}
+
+	for _, item := range futAllKey {
+		if _, err := helper.DefaultRedis.RemoveBeforeScore(item, float64(beforeTimeUtc)); err != nil {
+			logger.Error("合约 清理交易对价格缓存失败：", err)
+		}
+	}
+
+	return nil
+}

go.mod

@@ -1,8 +1,8 @@
 module go-admin
 
-go 1.24.0
+go 1.21.0
 
-toolchain go1.24.2
+toolchain go1.22.5
 
 require (
 	github.com/alibaba/sentinel-golang v1.0.4
@@ -47,8 +47,8 @@ require (
 	github.com/vmihailenco/msgpack/v5 v5.4.1
 	github.com/xuri/excelize/v2 v2.9.0
 	go.uber.org/zap v1.26.0
-	golang.org/x/crypto v0.43.0
-	golang.org/x/net v0.45.0
+	golang.org/x/crypto v0.31.0
+	golang.org/x/net v0.33.0
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 	gorm.io/driver/mysql v1.5.2
 	gorm.io/driver/postgres v1.5.4
@@ -174,13 +174,13 @@ require (
 	go.uber.org/multierr v1.10.0 // indirect
 	golang.org/x/arch v0.12.0 // indirect
 	golang.org/x/image v0.18.0 // indirect
-	golang.org/x/mod v0.28.0 // indirect
-	golang.org/x/sync v0.17.0 // indirect
-	golang.org/x/sys v0.37.0 // indirect
-	golang.org/x/term v0.36.0 // indirect
-	golang.org/x/text v0.30.0 // indirect
+	golang.org/x/mod v0.17.0 // indirect
+	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/term v0.27.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
-	golang.org/x/tools v0.37.0 // indirect
+	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
 	google.golang.org/protobuf v1.36.1 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect

models/binancedto/account.go

@@ -0,0 +1,11 @@
+package binancedto
+
+import "github.com/shopspring/decimal"
+
+type BinanceTransfer struct {
+	Type       string          `json:"type" content:"枚举 MAIN_UMFUTURE-现货到u合约"`
+	Asset      string          `json:"asset" content:"币种"`
+	Amount     decimal.Decimal `json:"amount" content:"数量"`
+	FromSymbol string          `json:"fromSymbol" content:"转出币种"`
+	ToSymbol   string          `json:"toSymbol" content:"转入币种"`
+}

models/coin.go

@@ -20,7 +20,6 @@ type TradeSet struct {
 	PriceDigit   int     `db:"pricecdigit" json:"pricecdigit"` //价格小数点位数
 	Currency     string  `db:"currency" json:"currency"`       //法币
 	Coin         string  `db:"coin" json:"coin"`               //币种
-	Symbol       string  `db:"symbol" json:"symbol"`           //交易对
 	PriceChange  float64 `db:"pricechange" json:"pricechange"` //价格波动价位
 	MinBuyVal    float64 `db:"minbuyval"`                      //最小下单金额
 	OpenPrice    float64 `db:"openprice"`                      //开盘价格
@@ -38,6 +37,10 @@ type TradeSet struct {
 	E            int64   `json:"-"`                            //推送时间
 }
 
+func (e *TradeSet) GetSymbol() string {
+	return e.Coin + e.Currency
+}
+
 //CommissionType  int     `db:"commissiontype"`                 //手续费:1买,2卖,3双向
 //DepositNum      float64 `db:"depositnum" json:"depositnum"`     //保证金规模(手)
 //ForceRate       float64 `db:"forcerate" json:"forcerate"`       //维持保证金率1%

models/positiondto/cache.go

@@ -31,28 +31,3 @@ type LinePreOrderPositioinDelReq struct {
 	ApiId        int    `json:"apiId"`        //apiid
 	ExchangeType string `json:"exchangeType"` //交易所类型
 }
-
-// 待触发加仓单
-type AddPositionList struct {
-	Id         int             `json:"id"`     //订单id
-	Pid        int             `json:"pid"`    //父级id
-	MainId     int             `json:"mainId"` //主单Id
-	ApiId      int             `json:"apiId"`  //触发账户id
-	Symbol     string          `json:"symbol"` //交易对
-	Price      decimal.Decimal `json:"price"`  //触发价
-	Side       string          `json:"side"`   //买卖方向
-	SymbolType int             `json:"type" comment:"交易对类别 1-现货 2-合约"`
-	OrderSn    string          `json:"prderSn"`
-}
-
-type ReduceListItem struct {
-	Id      int             `json:"id"`
-	ApiId   int             `json:"apiId"`
-	MainId  int             `json:"mainId"`
-	Pid     int             `json:"pid"`
-	Symbol  string          `json:"symbol"`
-	Price   decimal.Decimal `json:"price"`
-	Side    string          `json:"side"`
-	Num     decimal.Decimal `json:"num"`
-	OrderSn string          `json:"orderSn"`
-}

pkg/maphelper/maphelper.go

@@ -0,0 +1,46 @@
+package maphelper
+
+import (
+	"fmt"
+
+	"github.com/shopspring/decimal"
+)
+
+func GetString(m map[string]interface{}, key string) (string, error) {
+	val, ok := m[key]
+	if !ok {
+		return "", fmt.Errorf("参数错误，缺少字段 %s", key)
+	}
+	strVal, ok := val.(string)
+	if !ok {
+		return "", fmt.Errorf("字段 %s 类型错误", key)
+	}
+	return strVal, nil
+}
+
+func GetFloat64(m map[string]interface{}, key string) (float64, error) {
+	val, ok := m[key]
+	if !ok {
+		return 0, fmt.Errorf("参数错误，缺少字段 %s", key)
+	}
+	f, ok := val.(float64)
+	if !ok {
+		return 0, fmt.Errorf("字段 %s 类型错误", key)
+	}
+	return f, nil
+}
+
+func GetBool(m map[string]interface{}, key string) bool {
+	if val, ok := m[key].(bool); ok {
+		return val
+	}
+	return false
+}
+
+func GetDecimal(m map[string]interface{}, key string) decimal.Decimal {
+	if val, ok := m[key].(string); ok {
+		d, _ := decimal.NewFromString(val)
+		return d
+	}
+	return decimal.Zero
+}

pkg/retryhelper/retryhelper.go

@@ -0,0 +1,53 @@
+package retryhelper
+
+import (
+	"math"
+	"time"
+)
+
+// RetryOptions 定义重试的配置项
+type RetryOptions struct {
+	MaxRetries      int              // 最大重试次数
+	InitialInterval time.Duration    // 初始重试间隔
+	MaxInterval     time.Duration    // 最大重试间隔
+	BackoffFactor   float64          // 指数退避的增长因子
+	RetryableErrFn  func(error) bool // 用于判断是否为可重试错误的函数（可选）
+}
+
+func DefaultRetryOptions() RetryOptions {
+	return RetryOptions{
+		MaxRetries:      3,
+		InitialInterval: 150 * time.Millisecond,
+		MaxInterval:     3 * time.Second,
+		BackoffFactor:   2.0,
+	}
+}
+
+// Retry 重试通用函数（用于没有返回值的函数）
+func Retry(op func() error, opts RetryOptions) error {
+	_, err := RetryWithResult(func() (struct{}, error) {
+		return struct{}{}, op()
+	}, opts)
+	return err
+}
+
+// RetryWithResult 重试通用函数（用于带返回值的函数）
+func RetryWithResult[T any](op func() (T, error), opts RetryOptions) (result T, err error) {
+	interval := opts.InitialInterval
+	for attempt := 0; attempt <= opts.MaxRetries; attempt++ {
+		result, err = op()
+		if err == nil {
+			return result, nil
+		}
+
+		if opts.RetryableErrFn != nil && !opts.RetryableErrFn(err) {
+			return result, err
+		}
+
+		if attempt < opts.MaxRetries {
+			time.Sleep(interval)
+			interval = time.Duration(math.Min(float64(opts.MaxInterval), float64(interval)*opts.BackoffFactor))
+		}
+	}
+	return result, err
+}

pkg/utility/snowflakehelper/snowflakehelper.go

@@ -28,3 +28,7 @@ func init() {
 func GetOrderId() int64 {
 	return snowNode.Generate().Int64()
 }
+
+func GetOrderNo() string {
+	return fmt.Sprintf("%d", GetOrderId())
+}

services/binanceservice/binancerest.go

@@ -14,7 +14,6 @@ import (
 	"go-admin/models/spot"
 	"go-admin/pkg/httputils"
 	"go-admin/pkg/utility"
-	"go-admin/services/commonservice"
 	"strings"
 	"time"
 
@@ -127,7 +126,7 @@ func (e SpotRestApi) GetSpotTicker24h(tradeSet *map[string]models.TradeSet) (del
 			log.Error("缓存交易对失败|", item.Symbol, err)
 		}
 
-		helper.DefaultRedis.AddSortSet(fmt.Sprintf(global.COIN_PRICE_CHANGE, global.EXCHANGE_BINANCE), symbol.PriceChange, symbol.Coin)
+		helper.DefaultRedis.AddSortSet(global.COIN_PRICE_CHANGE, symbol.PriceChange, symbol.Coin)
 	}
 	return deleteSymbols, nil
 }
@@ -170,12 +169,12 @@ type Ticker struct {
 	Price  string `json:"price"`
 }
 
-// func (e SpotRestApi) Ticker() {
-// 	tickerApi := fmt.Sprintf("%s%s", binanceRestApi, "/api/v3/ticker/price")
-// 	mapData, _ := httputils.NewHttpRequestWithFasthttp("GET", tickerApi, "", map[string]string{})
-// 	//sonic.Unmarshal(mapData, &tickerData)
-// 	helper.DefaultRedis.SetString(rediskey.SpotSymbolTicker, string(mapData))
-// }
+func (e SpotRestApi) Ticker() {
+	tickerApi := fmt.Sprintf("%s%s", binanceRestApi, "/api/v3/ticker/price")
+	mapData, _ := httputils.NewHttpRequestWithFasthttp("GET", tickerApi, "", map[string]string{})
+	//sonic.Unmarshal(mapData, &tickerData)
+	helper.DefaultRedis.SetString(rediskey.SpotSymbolTicker, string(mapData))
+}
 
 // 循环下单
 func (e SpotRestApi) OrderPlaceLoop(db *gorm.DB, params OrderPlacementService, retryCount int) error {
@@ -453,7 +452,7 @@ func GetApiInfo(apiId int) (DbModels.LineApiUser, error) {
 		}
 	}
 
-	db := commonservice.GetDBConnection()
+	db := GetDBConnection()
 
 	if err := db.Model(&api).Where("id =?", apiId).First(&api).Error; err != nil {
 		return api, err
@@ -468,6 +467,21 @@ func GetApiInfo(apiId int) (DbModels.LineApiUser, error) {
 	return api, nil
 }
 
+// GetReverseApiInfo 根据apiKey获取api用户信息
+func GetApiInfoByKey(apiKey string) DbModels.LineApiUser {
+	result := DbModels.LineApiUser{}
+	keys, _ := helper.DefaultRedis.GetAllKeysAndValues(fmt.Sprintf(rediskey.API_USER, "*"))
+
+	for _, key := range keys {
+		if strings.Contains(key, apiKey) {
+			sonic.UnmarshalString(key, &result)
+			break
+		}
+	}
+
+	return result
+}
+
 /*
 根据A账户获取B账号信息
 */
@@ -641,3 +655,43 @@ func GetSpotUProperty(apiUserInfo DbModels.LineApiUser, data *dto.LineUserProper
 
 	return nil
 }
+
+// 万象划转
+func TradeAmount(db *gorm.DB, req *binancedto.BinanceTransfer, apiUserInfo DbModels.LineApiUser) error {
+	url := "/sapi/v1/asset/transfer"
+
+	client := GetClient(&apiUserInfo)
+
+	params := map[string]string{
+		"type":       req.Type,
+		"asset":      req.Asset,
+		"amount":     req.Amount.String(),
+		"fromSymbol": req.FromSymbol,
+		"toSymbol":   req.ToSymbol,
+		"recvWindow": "10000",
+	}
+
+	_, code, err := client.SendSpotAuth(url, "POST", 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 fmt.Errorf("api_id:%d 万向划转失败:%+v", apiUserInfo.Id, err.Error())
+			}
+		}
+
+		code, ok := dataMap["code"]
+		if ok {
+			return fmt.Errorf("api_id:%d 万向划转失败:%s", apiUserInfo.Id, ErrorMaps[code.(float64)])
+		}
+		if strings.Contains(err.Error(), "Unknown order sent.") {
+			return fmt.Errorf("api_id:%d 万向划转失败:%+v", apiUserInfo.Id, ErrorMaps[-2011])
+		}
+		return fmt.Errorf("api_id:%d 万向划转失败:%+v", apiUserInfo.Id, err.Error())
+	}
+
+	return nil
+}

services/binanceservice/commonservice.go

@@ -9,7 +9,6 @@ import (
 	"go-admin/common/helper"
 	"go-admin/models/positiondto"
 	"go-admin/pkg/utility"
-	"go-admin/services/commonservice"
 	"go-admin/services/positionservice"
 	"strings"
 	"time"
@@ -17,6 +16,7 @@ import (
 	"github.com/bytedance/sonic"
 	"github.com/go-admin-team/go-admin-core/logger"
 	log "github.com/go-admin-team/go-admin-core/logger"
+	"github.com/go-admin-team/go-admin-core/sdk"
 	"github.com/shopspring/decimal"
 	"gorm.io/gorm"
 )
@@ -105,7 +105,7 @@ func CancelSpotOrder(symbol string, apiUserInfo *DbModels.LineApiUser, side stri
 	}
 	client := GetClient(apiUserInfo)
 	resp, _, err := client.SendSpotAuth(searchEndpoint, "GET", searchParams)
-	db := commonservice.GetDBConnection()
+	db := GetDBConnection()
 
 	if err != nil {
 		if len(resp) > 0 {
@@ -209,16 +209,58 @@ func (e *AddPosition) GetFutSpotOrderInfo(req dto.ManuallyCover, symbol, orderTy
 	return orderInfo, nil
 }
 
+// CalculateAmount 计算加仓数量
+func (e *AddPosition) CalculateAmount(req dto.ManuallyCover, totalNum, lastPrice decimal.Decimal, amountDigit int, notUsdt bool, symbolInfo DbModels.LineSymbol) (decimal.Decimal, error) {
+	var amt decimal.Decimal
+	if req.CoverType == 1 {
+		decimalValue := utility.StringToDecimal(req.Value).Div(decimal.NewFromInt(100))
+		amt = totalNum.Mul(decimalValue)
+	} else {
+		decimalValue := utility.StringToDecimal(req.Value)
+		if notUsdt {
+			tickerSymbolMaps := make([]dto.Ticker, 0)
+			tickerSymbol := helper.DefaultRedis.Get(rediskey.SpotSymbolTicker).Val()
+			if err := sonic.Unmarshal([]byte(tickerSymbol), &tickerSymbolMaps); err != nil {
+				return decimal.Zero, err
+			}
+
+			var tickerPrice decimal.Decimal
+			for _, symbolMap := range tickerSymbolMaps {
+				if symbolMap.Symbol == strings.ToUpper(symbolInfo.BaseAsset+"USDT") {
+					tickerPrice, _ = decimal.NewFromString(symbolMap.Price)
+					break
+				}
+			}
+
+			for _, symbolMap := range tickerSymbolMaps {
+				if symbolMap.Symbol == strings.ToUpper(symbolInfo.QuoteAsset+"USDT") {
+					uTickerPrice, _ := decimal.NewFromString(symbolMap.Price)
+					div := tickerPrice.Div(decimal.NewFromInt(1).Div(uTickerPrice))
+					amt = decimalValue.Div(div)
+					break
+				}
+			}
+		} else {
+			amt = decimalValue.Div(lastPrice)
+		}
+	}
+	return amt.Truncate(int32(amountDigit)), nil
+}
+
 // 主单平仓删除缓存
 // mainOrderId 主单id
 // symbolType 1现货 2合约
 func MainClosePositionClearCache(mainId int, symbolType int) {
+	strategyDto := dto.StrategyOrderRedisList{}
+
 	if symbolType == 1 {
 		keySpotStop := fmt.Sprintf(rediskey.SpotStopLossList, global.EXCHANGE_BINANCE)
 		keySpotAddposition := fmt.Sprintf(rediskey.SpotAddPositionList, global.EXCHANGE_BINANCE)
 		spotStopArray, _ := helper.DefaultRedis.GetAllList(keySpotStop)
 		spotAddpositionArray, _ := helper.DefaultRedis.GetAllList(keySpotAddposition)
-		var position positiondto.AddPositionList
+		spotStrategyKey := fmt.Sprintf(rediskey.StrategySpotOrderList, global.EXCHANGE_BINANCE)
+		spotStrategyList, _ := helper.DefaultRedis.GetAllList(spotStrategyKey)
+		var position AddPositionList
 		var stop dto.StopLossRedisList
 
 		for _, item := range spotAddpositionArray {
@@ -241,12 +283,24 @@ func MainClosePositionClearCache(mainId int, symbolType int) {
 			}
 		}
 
+		for _, item := range spotStrategyList {
+			sonic.Unmarshal([]byte(item), &strategyDto)
+
+			if strategyDto.Id == mainId {
+				if _, err := helper.DefaultRedis.LRem(spotStrategyKey, item); err != nil {
+					logger.Errorf("id:%d 移除缓存失败,err:%v", mainId, err)
+				}
+			}
+		}
 	} else {
 		keyFutStop := fmt.Sprintf(rediskey.FuturesAddPositionList, global.EXCHANGE_BINANCE)
 		keyFutAddposition := fmt.Sprintf(rediskey.FuturesStopLossList, global.EXCHANGE_BINANCE)
 		futAddpositionArray, _ := helper.DefaultRedis.GetAllList(keyFutStop)
 		futStopArray, _ := helper.DefaultRedis.GetAllList(keyFutAddposition)
-		var position positiondto.AddPositionList
+
+		futStrategyKey := fmt.Sprintf(rediskey.StrategyFutOrderList, global.EXCHANGE_BINANCE)
+		futStrategyList, _ := helper.DefaultRedis.GetAllList(futStrategyKey)
+		var position AddPositionList
 		var stop dto.StopLossRedisList
 
 		for _, item := range futAddpositionArray {
@@ -268,9 +322,28 @@ func MainClosePositionClearCache(mainId int, symbolType int) {
 				helper.DefaultRedis.LRem(keyFutStop, item)
 			}
 		}
+
+		for _, item := range futStrategyList {
+			sonic.Unmarshal([]byte(item), &strategyDto)
+
+			if strategyDto.Id == mainId {
+				if _, err := helper.DefaultRedis.LRem(futStrategyKey, item); err != nil {
+					logger.Errorf("id:%d 移除缓存失败,err:%v", mainId, err)
+				}
+			}
+		}
 	}
 }
 
+// 获取数据库连接
+func GetDBConnection() *gorm.DB {
+	dbs := sdk.Runtime.GetDb()
+	for _, db := range dbs {
+		return db
+	}
+	return nil
+}
+
 // 查询订单
 func getPreOrder(db *gorm.DB, orderSn interface{}) (*DbModels.LinePreOrder, error) {
 	preOrder := &DbModels.LinePreOrder{}
@@ -406,3 +479,13 @@ func GetOpenOrderSns(db *gorm.DB, mainIds []int) ([]string, error) {
 
 	return result, nil
 }
+
+// 回去反单默认配置
+func GetReverseSetting(db *gorm.DB) (DbModels.LineReverseSetting, error) {
+	var setting DbModels.LineReverseSetting
+	if err := db.Model(&DbModels.LineReverseSetting{}).First(&setting).Error; err != nil {
+		return setting, err
+	}
+
+	return setting, nil
+}

services/binanceservice/futures_judge_service_test.go

@@ -6,7 +6,6 @@ import (
 	"go-admin/common/global"
 	"go-admin/common/helper"
 	"go-admin/models"
-	"go-admin/models/positiondto"
 	"go-admin/services/cacheservice"
 	"testing"
 
@@ -29,8 +28,8 @@ func TestFutureJudge(t *testing.T) {
 	// }
 
 	key := fmt.Sprintf(rediskey.FuturesReduceList, global.EXCHANGE_BINANCE)
-	item := `{"id":50,"apiId":49,"mainId":47,"pid":47,"symbol":"ADAUSDT","price":"0.5936","side":"SELL","num":"12","orderSn":"397913127842217984"}`
-	reduceOrder := positiondto.ReduceListItem{}
+	item := `{"id":10,"apiId":49,"mainId":7,"pid":7,"symbol":"ADAUSDT","price":"0.6244","side":"BUY","num":"12","orderSn":"398690240274890752"}`
+	reduceOrder := ReduceListItem{}
 	futApi := FutRestApi{}
 	setting, err := cacheservice.GetSystemSetting(db)
 

services/binanceservice/futures_reset_v2.go

@@ -0,0 +1,125 @@
+package binanceservice
+
+import (
+	"fmt"
+	"strings"
+
+	DbModels "go-admin/app/admin/models"
+	"go-admin/pkg/retryhelper"
+
+	"github.com/bytedance/sonic"
+	log "github.com/go-admin-team/go-admin-core/logger"
+	"github.com/go-admin-team/go-admin-core/sdk/service"
+)
+
+type FuturesResetV2 struct {
+	service.Service
+}
+
+// 带重试机制的合约下单
+func (e *FuturesResetV2) OrderPlaceLoop(apiUserInfo *DbModels.LineApiUser, params FutOrderPlace) error {
+	opts := retryhelper.DefaultRetryOptions()
+	opts.RetryableErrFn = func(err error) bool {
+		if strings.Contains(err.Error(), "LOT_SIZE") {
+			return false
+		}
+		//重试
+		return true
+	}
+
+	err := retryhelper.Retry(func() error {
+		return e.OrderPlace(apiUserInfo, params)
+	}, opts)
+
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// 合约下单
+func (e *FuturesResetV2) OrderPlace(apiUserInfo *DbModels.LineApiUser, params FutOrderPlace) error {
+	if err := params.CheckParams(); err != nil {
+		return err
+	}
+
+	orderType := strings.ToUpper(params.OrderType)
+	side := strings.ToUpper(params.Side)
+
+	paramsMaps := map[string]string{
+		"symbol":           params.Symbol,
+		"side":             side,
+		"type":             orderType,
+		"newClientOrderId": params.NewClientOrderId,
+		"positionSide":     params.PositionSide,
+	}
+
+	// 设置市价和限价等类型的参数
+	switch orderType {
+	case "LIMIT":
+		paramsMaps["price"] = params.Price.String()
+		paramsMaps["timeInForce"] = "GTC"
+	case "TAKE_PROFIT_MARKET":
+		paramsMaps["timeInForce"] = "GTC"
+		paramsMaps["stopprice"] = params.Profit.String()
+		paramsMaps["workingType"] = "MARK_PRICE"
+
+		if params.ClosePosition {
+			paramsMaps["closePosition"] = "true"
+		}
+	case "TAKE_PROFIT":
+		paramsMaps["price"] = params.Price.String()
+		paramsMaps["stopprice"] = params.Profit.String()
+		paramsMaps["timeInForce"] = "GTC"
+	case "STOP_MARKET":
+		paramsMaps["stopprice"] = params.StopPrice.String()
+		paramsMaps["workingType"] = "MARK_PRICE"
+		paramsMaps["timeInForce"] = "GTC"
+
+		if params.ClosePosition {
+			paramsMaps["closePosition"] = "true"
+		}
+	case "STOP":
+		paramsMaps["price"] = params.Price.String()
+		paramsMaps["stopprice"] = params.StopPrice.String()
+		paramsMaps["workingType"] = "MARK_PRICE"
+		paramsMaps["timeInForce"] = "GTC"
+	}
+
+	//不是平仓
+	if !params.ClosePosition {
+		paramsMaps["quantity"] = params.Quantity.String()
+	}
+	// 获取 API 信息和发送下单请求
+	client := GetClient(apiUserInfo)
+	_, statusCode, err := client.SendFuturesRequestAuth("/fapi/v1/order", "POST", paramsMaps)
+
+	if err != nil {
+		return parseOrderError(err, paramsMaps, statusCode, apiUserInfo)
+	}
+	return nil
+}
+
+// 拆出的错误解析函数
+func parseOrderError(err error, paramsMaps map[string]string, statusCode int, apiUserInfo *DbModels.LineApiUser) error {
+	var dataMap map[string]interface{}
+
+	if err2 := sonic.Unmarshal([]byte(err.Error()), &dataMap); err2 == nil {
+		if code, ok := dataMap["code"]; ok {
+			paramsVal, _ := sonic.MarshalString(&paramsMaps)
+			log.Error("下单失败 参数:", paramsVal)
+			errContent := FutErrorMaps[code.(float64)]
+			if errContent == "" {
+				errContent, _ = dataMap["msg"].(string)
+			}
+			return fmt.Errorf("api_id:%d 交易对:%s 下单失败:%s", apiUserInfo.Id, paramsMaps["symbol"], errContent)
+		}
+	}
+
+	// 特殊处理保证金不足
+	if strings.Contains(err.Error(), "Margin is insufficient.") {
+		return fmt.Errorf("api_id:%d 交易对:%s 下单失败:%s", apiUserInfo.Id, paramsMaps["symbol"], FutErrorMaps[-2019])
+	}
+
+	return fmt.Errorf("api_id:%d 交易对:%s statusCode:%v 下单失败:%s", apiUserInfo.Id, paramsMaps["symbol"], statusCode, err.Error())
+}

services/binanceservice/futuresbinancerest.go

@@ -5,14 +5,15 @@ import (
 	"fmt"
 	DbModels "go-admin/app/admin/models"
 	"go-admin/app/admin/service/dto"
+	"go-admin/common/const/rediskey"
 	"go-admin/common/global"
 	"go-admin/common/helper"
 	"go-admin/models"
 	"go-admin/models/binancedto"
 	"go-admin/models/futuresdto"
 	"go-admin/pkg/httputils"
+	"go-admin/pkg/retryhelper"
 	"go-admin/pkg/utility"
-	"go-admin/services/cacheservice"
 	"strconv"
 	"strings"
 	"time"
@@ -261,18 +262,18 @@ func GetAndReloadSymbols(data *map[string]models.TradeSet) error {
 	return nil
 }
 
-// func (e FutRestApi) Ticker() {
-// 	url := fmt.Sprintf("%s%s", futureApi, "/fapi/v1/ticker/price")
-// 	mapData, err := httputils.NewHttpRequestWithFasthttp("GET", url, "", map[string]string{})
-// 	if err != nil {
-// 		log.Error("获取合约交易对行情失败:err:", err)
-// 	}
+func (e FutRestApi) Ticker() {
+	url := fmt.Sprintf("%s%s", futureApi, "/fapi/v1/ticker/price")
+	mapData, err := httputils.NewHttpRequestWithFasthttp("GET", url, "", map[string]string{})
+	if err != nil {
+		log.Error("获取合约交易对行情失败:err:", err)
+	}
 
-// 	if len(mapData) == 0 {
-// 		log.Error("获取合约交易对行情失败，或数量为空")
-// 	}
-// 	helper.DefaultRedis.SetString(rediskey.FutSymbolTicker, string(mapData))
-// }
+	if len(mapData) == 0 {
+		log.Error("获取合约交易对行情失败，或数量为空")
+	}
+	helper.DefaultRedis.SetString(rediskey.FutSymbolTicker, string(mapData))
+}
 
 // 获取合约行情
 func GetTicker24h() ([]futuresdto.FutureTicker24h, error) {
@@ -555,50 +556,6 @@ func (e FutRestApi) OrderPlace(orm *gorm.DB, params FutOrderPlace) error {
 	return nil
 }
 
-// ClosePositionB 平仓B对应的交易对
-// bApiUserInfo B 账户api-user信息
-// symbol 需要平仓的交易对
-// closeType 平仓模式 ALL = 全平 reduceOnly = 只减仓
-// func (e FutRestApi) ClosePositionB(orm *gorm.DB, bApiUserInfo *DbModels.LineApiUser, symbol string, closeType string) error {
-// 	if bApiUserInfo == nil {
-// 		return errors.New("缺失平仓账户信息")
-// 	}
-// 	if symbol == "" {
-// 		return errors.New("缺失平仓交易对信息")
-// 	}
-// 	risks, err := e.GetPositionV3(bApiUserInfo, symbol)
-// 	if err != nil {
-// 		return err
-// 	}
-
-// 	for _, risk := range risks {
-// 		if risk.Symbol == strings.ToUpper(symbol) {
-// 			//持仓数量
-// 			positionAmt, _ := decimal.NewFromString(risk.PositionAmt)
-// 			side := "BUY"
-// 			if positionAmt.GreaterThan(decimal.Zero) {
-// 				side = "SELL"
-// 			}
-// 			var closeAmt decimal.Decimal
-// 			if strings.ToUpper(closeType) == "ALL" { //全部平仓
-// 				closeAmt = positionAmt
-// 			} else {
-// 				//如果是只减仓的话 数量=仓位数量*比例
-// 				closeAmt = positionAmt.Mul(decimal.NewFromFloat(reduceOnlyRate))
-// 			}
-
-// 			err = e.ClosePosition(symbol, closeAmt, side, *bApiUserInfo, "MARKET", "", decimal.Zero)
-// 			if err != nil {
-// 				return err
-// 			}
-// 			orm.Model(&DbModels.LinePreOrder{}).Where("api_id = ? AND symbol = ?", bApiUserInfo.Id, symbol).Updates(map[string]interface{}{
-// 				"status": "6",
-// 			})
-// 		}
-// 	}
-// 	return nil
-// }
-
 // 获取合约 持仓价格、数量
 // symbol:交易对
 // side:方向
@@ -642,6 +599,49 @@ func (e FutRestApi) GetHoldeData(apiInfo *DbModels.LineApiUser, symbol, side str
 	return nil
 }
 
+// 获取合约 持仓价格、数量
+// symbol:交易对
+// positionSide:持仓方向
+// holdeData:持仓数据
+func (e FutRestApi) GetPositionData(apiInfo *DbModels.LineApiUser, symbol, positionSide string, holdeData *HoldeData) error {
+	opts := retryhelper.DefaultRetryOptions()
+	opts.RetryableErrFn = func(err error) bool {
+		if strings.Contains(err.Error(), "LOT_SIZE") {
+			return false
+		}
+		//重试
+		return true
+	}
+
+	holdes, err := retryhelper.RetryWithResult(func() ([]PositionRisk, error) {
+		return e.GetPositionV3(apiInfo, symbol)
+	}, opts)
+
+	if err != nil {
+		return err
+	}
+
+	for _, item := range holdes {
+		positionAmount, _ := decimal.NewFromString(item.PositionAmt)
+		if (positionSide == "LONG" && item.PositionSide == "BOTH" && positionAmount.Cmp(decimal.Zero) > 0) || item.PositionSide == positionSide { //多
+			holdeData.AveragePrice, _ = decimal.NewFromString(item.EntryPrice)
+			holdeData.TotalQuantity = positionAmount.Abs()
+			continue
+		} else if (positionSide == "SHORT" && item.PositionSide == "BOTH" && positionAmount.Cmp(decimal.Zero) < 0) || item.PositionSide == positionSide { //空
+			holdeData.AveragePrice, _ = decimal.NewFromString(item.EntryPrice)
+			holdeData.TotalQuantity = positionAmount.Abs()
+			continue
+		}
+	}
+
+	if holdeData.AveragePrice.Cmp(decimal.Zero) == 0 {
+		holdesVal, _ := sonic.MarshalString(&holdes)
+		log.Error("均价错误 symbol:", symbol, " 数据：", holdesVal)
+	}
+
+	return nil
+}
+
 // 获取代币持仓信息
 func getSymbolHolde(e FutRestApi, apiInfo *DbModels.LineApiUser, symbol string, side string, holdeData *HoldeData) ([]PositionRisk, error) {
 	holdes, err := e.GetPositionV3(apiInfo, symbol)
@@ -759,6 +759,15 @@ func (e FutRestApi) ClosePosition(symbol string, orderSn string, quantity decima
 	return nil
 }
 
+// 带重试机制的取消订单
+func (e FutRestApi) CancelFutOrderRetry(apiUserInfo DbModels.LineApiUser, symbol string, newClientOrderId string) error {
+	opts := retryhelper.DefaultRetryOptions()
+
+	return retryhelper.Retry(func() error {
+		return e.CancelFutOrder(apiUserInfo, symbol, newClientOrderId)
+	}, opts)
+}
+
 // CancelFutOrder 通过单个订单号取消合约委托
 // symbol 交易对
 // newClientOrderId 系统自定义订单号
@@ -818,6 +827,27 @@ func (e FutRestApi) CancelAllFutOrder(apiUserInfo DbModels.LineApiUser, symbol s
 	return nil
 }
 
+// 带重试的批量撤销订单
+func (e FutRestApi) CancelBatchFutOrderLoop(apiUserInfo DbModels.LineApiUser, symbol string, newClientOrderIdList []string) error {
+	opts := retryhelper.DefaultRetryOptions()
+	opts.RetryableErrFn = func(err error) bool {
+		if strings.Contains(err.Error(), "LOT_SIZE") {
+			return false
+		}
+		//重试
+		return true
+	}
+
+	err := retryhelper.Retry(func() error {
+		return e.CancelBatchFutOrder(apiUserInfo, symbol, newClientOrderIdList)
+	}, opts)
+
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 // CancelBatchFutOrder 批量撤销订单
 // symbol 交易对
 // newClientOrderIdList 系统自定义的订单号, 最多支持10个订单
@@ -862,10 +892,9 @@ func (e FutRestApi) CancelBatchFutOrder(apiUserInfo DbModels.LineApiUser, symbol
 // quoteSymbol 计价货币  ETHBTC -> 计价货币就是BTC
 // totalMoney 兑换的总金额
 func (e FutRestApi) CalcSymbolExchangeAmt(symbol string, quoteSymbol string, totalMoney decimal.Decimal) decimal.Decimal {
-	// tickerSymbol := helper.DefaultRedis.Get(rediskey.FutSymbolTicker).Val()
-	// tickerSymbolMaps := make([]dto.Ticker, 0)
-	// sonic.Unmarshal([]byte(tickerSymbol), &tickerSymbolMaps)
-	tickerSymbolMaps, _ := cacheservice.GetExchangeTradeSets(global.EXCHANGE_BINANCE, 1)
+	tickerSymbol := helper.DefaultRedis.Get(rediskey.FutSymbolTicker).Val()
+	tickerSymbolMaps := make([]dto.Ticker, 0)
+	sonic.Unmarshal([]byte(tickerSymbol), &tickerSymbolMaps)
 
 	targetSymbol := strings.Replace(symbol, quoteSymbol, "USDT", 1) //ETHBTC -》 ETHUSDT
 	key := fmt.Sprintf("%s:%s", global.TICKER_FUTURES, targetSymbol)
@@ -874,7 +903,7 @@ func (e FutRestApi) CalcSymbolExchangeAmt(symbol string, quoteSymbol string, tot
 	quantity := decimal.Zero
 	for _, symbolMap := range tickerSymbolMaps {
 		if symbolMap.Symbol == strings.ToUpper(targetSymbol) {
-			targetPrice, _ = decimal.NewFromString(symbolMap.LastPrice)
+			targetPrice, _ = decimal.NewFromString(symbolMap.Price)
 			quantity = totalMoney.Div(targetPrice).Truncate(int32(tradeSet.AmountDigit))
 		}
 	}

services/binanceservice/futuresjudgeservice.go

@@ -10,11 +10,8 @@ import (
 	"go-admin/common/global"
 	"go-admin/common/helper"
 	"go-admin/models"
-	"go-admin/models/positiondto"
 	"go-admin/pkg/utility"
 	"go-admin/services/cacheservice"
-	"go-admin/services/commonservice"
-	"go-admin/services/orderservice"
 	"strings"
 	"time"
 
@@ -29,7 +26,7 @@ import (
 */
 func JudgeFuturesPrice(tradeSet models.TradeSet) {
 	preOrderVal, _ := helper.DefaultRedis.GetAllList(fmt.Sprintf(rediskey.PreFutOrderList, global.EXCHANGE_BINANCE))
-	db := commonservice.GetDBConnection()
+	db := GetDBConnection()
 
 	if len(preOrderVal) == 0 {
 		return
@@ -156,7 +153,7 @@ func JudgeFuturesReduce(trade models.TradeSet) {
 	key := fmt.Sprintf(rediskey.FuturesReduceList, global.EXCHANGE_BINANCE)
 	reduceVal, _ := helper.DefaultRedis.GetAllList(key)
 
-	db := commonservice.GetDBConnection()
+	db := GetDBConnection()
 	futApi := FutRestApi{}
 	setting, err := cacheservice.GetSystemSetting(db)
 
@@ -165,14 +162,12 @@ func JudgeFuturesReduce(trade models.TradeSet) {
 		return
 	}
 
-	reduceOrder := positiondto.ReduceListItem{}
+	reduceOrder := ReduceListItem{}
 	tradePrice, _ := decimal.NewFromString(trade.LastPrice)
 	//减仓单减仓策略
 	reduceReduceListKey := fmt.Sprintf(rediskey.FutOrderReduceStrategyList, global.EXCHANGE_BINANCE)
 	orderReduceVal, _ := helper.DefaultRedis.HGetAllFields(reduceReduceListKey)
 	reduceOrderStrategy := dto.LineOrderReduceStrategyResp{}
-	orderService := orderservice.OrderService{}
-	orderService.Orm = db
 
 	for _, item := range orderReduceVal {
 		sonic.Unmarshal([]byte(item), &reduceOrderStrategy)
@@ -198,7 +193,7 @@ func JudgeFuturesReduce(trade models.TradeSet) {
 							return
 						}
 
-						order, err := orderService.CreateReduceReduceOrder(db, reduceOrderStrategy.OrderId, item2.Price, item2.Num, trade.PriceDigit)
+						order, err := CreateReduceReduceOrder(db, reduceOrderStrategy.OrderId, item2.Price, item2.Num, trade.PriceDigit)
 
 						if err != nil {
 							log.Errorf("%d 生成订单失败", reduceOrderStrategy.OrderId)
@@ -266,8 +261,8 @@ func JudgeFuturesReduce(trade models.TradeSet) {
 // 触发合约减仓
 // isStrategy 是否是策略减仓
 // reduceId 父减仓单id
-func FuturesReduceTrigger(db *gorm.DB, reduceOrder positiondto.ReduceListItem, futApi FutRestApi, setting DbModels.LineSystemSetting, key, item string, isStrategy bool, reduceId int) bool {
-	tradeSet, _ := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, reduceOrder.Symbol, 2)
+func FuturesReduceTrigger(db *gorm.DB, reduceOrder ReduceListItem, futApi FutRestApi, setting DbModels.LineSystemSetting, key, item string, isStrategy bool, reduceId int) bool {
+	tradeSet, _ := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, reduceOrder.Symbol, 1)
 	result := true
 
 	if tradeSet.LastPrice == "" {
@@ -282,9 +277,10 @@ func FuturesReduceTrigger(db *gorm.DB, reduceOrder positiondto.ReduceListItem, f
 	} else if ok {
 		defer lock.Release()
 		takeOrders := make([]DbModels.LinePreOrder, 0)
-		if err := db.Model(&DbModels.LinePreOrder{}).Where("main_id =? AND order_type IN (1,2,4) AND status IN (1,5)", reduceOrder.MainId).Find(&takeOrders).Error; err != nil {
+		//只取消减仓单 止盈止损减仓成功后取消
+		if err := db.Model(&DbModels.LinePreOrder{}).Where("main_id =? AND order_type IN 4 AND status IN (1,5)", reduceOrder.MainId).Find(&takeOrders).Error; err != nil {
 			log.Error("查询止盈单失败")
-			return false
+			// return false
 		}
 
 		var hasrecord bool
@@ -367,7 +363,7 @@ func FuturesReduceTrigger(db *gorm.DB, reduceOrder positiondto.ReduceListItem, f
 func JudgeFutAddPosition(trade models.TradeSet) {
 	key := fmt.Sprintf(rediskey.FuturesAddPositionList, global.EXCHANGE_BINANCE)
 	preOrderVal, _ := helper.DefaultRedis.GetAllList(key)
-	db := commonservice.GetDBConnection()
+	db := GetDBConnection()
 
 	if len(preOrderVal) == 0 {
 		return
@@ -375,7 +371,7 @@ func JudgeFutAddPosition(trade models.TradeSet) {
 
 	futApi := FutRestApi{}
 	for _, item := range preOrderVal {
-		preOrder := positiondto.AddPositionList{}
+		preOrder := AddPositionList{}
 		if err := sonic.Unmarshal([]byte(item), &preOrder); err != nil {
 			log.Error("反序列化失败")
 			continue
@@ -399,7 +395,7 @@ func JudgeFutAddPosition(trade models.TradeSet) {
 }
 
 // 合约加仓触发
-func FutAddPositionTrigger(db *gorm.DB, v *positiondto.AddPositionList, item string, futApi FutRestApi) {
+func FutAddPositionTrigger(db *gorm.DB, v *AddPositionList, item string, futApi FutRestApi) {
 	lock := helper.NewRedisLock(fmt.Sprintf(rediskey.FutTrigger, v.ApiId, v.Symbol), 20, 5, 100*time.Millisecond)
 
 	if ok, err := lock.AcquireWait(context.Background()); err != nil {
@@ -409,7 +405,7 @@ func FutAddPositionTrigger(db *gorm.DB, v *positiondto.AddPositionList, item str
 		defer lock.Release()
 
 		setting, _ := cacheservice.GetSystemSetting(db)
-		tradeSet, _ := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, v.Symbol, 2)
+		tradeSet, _ := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, v.Symbol, 1)
 
 		if tradeSet.LastPrice == "" {
 			log.Errorf("合约加仓触发 查询交易对失败 交易对：%s ordersn:%s", v.Symbol, v.OrderSn)

services/binanceservice/futuresrest.go

@@ -14,7 +14,6 @@ import (
 	"go-admin/models/positiondto"
 	"go-admin/pkg/utility"
 	"go-admin/services/cacheservice"
-	"go-admin/services/commonservice"
 	"strings"
 	"time"
 
@@ -28,7 +27,7 @@ import (
 /*
 修改订单信息
 */
-func ChangeFutureOrder(mapData map[string]interface{}) {
+func ChangeFutureOrder(mapData map[string]interface{}, apiKey string) {
 	// 检查订单号是否存在
 	orderSn, ok := mapData["c"]
 	originOrderSn := mapData["C"] //取消操作 代表原始订单号
@@ -43,7 +42,7 @@ func ChangeFutureOrder(mapData map[string]interface{}) {
 	}
 
 	// 获取数据库连接
-	db := commonservice.GetDBConnection()
+	db := GetDBConnection()
 	if db == nil {
 		logger.Error("合约订单回调失败,无法获取数据库连接")
 		return
@@ -62,34 +61,15 @@ func ChangeFutureOrder(mapData map[string]interface{}) {
 	}
 	defer lock.Release()
 
-	// 查询订单
-	preOrder, err := getPreOrder(db, orderSn)
+	//反单逻辑
+	reverseService := ReverseService{}
+	reverseService.Orm = db
+	reverseService.Log = logger.NewHelper(logger.DefaultLogger)
+	_, err = reverseService.ReverseOrder(apiKey, mapData)
+
 	if err != nil {
-		logger.Error("合约订单回调失败,查询订单失败:", orderSn, " err:", err)
-		return
+		logger.Errorf("合约订单回调失败,反单失败:%v", err)
 	}
-
-	// 解析订单状态
-	status, ok := mapData["X"].(string)
-	if !ok {
-		mapStr, _ := sonic.Marshal(&mapData)
-		logger.Error("订单回调失败,没有状态:", string(mapStr))
-		return
-	}
-	// 更新订单状态
-	orderStatus, reason := parseOrderStatus(status, mapData)
-
-	if orderStatus == 0 {
-		logger.Error("订单回调失败,状态错误:", orderSn, " status:", status, " reason:", reason)
-		return
-	}
-
-	if err := updateOrderStatus(db, preOrder, orderStatus, reason, true, mapData); err != nil {
-		logger.Error("修改订单状态失败:", orderSn, " err:", err)
-		return
-	}
-
-	handleFutOrderByType(db, preOrder, orderStatus)
 }
 
 // 合约回调
@@ -128,7 +108,7 @@ func handleReduceFilled(db *gorm.DB, preOrder *DbModels.LinePreOrder) {
 		return
 	}
 
-	tradeSet, err := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, preOrder.Symbol, 2)
+	tradeSet, err := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, preOrder.Symbol, 1)
 
 	if err != nil {
 		logger.Errorf("handleReduceFilled 获取交易对设置失败,订单号:%s", preOrder.OrderSn)
@@ -146,6 +126,8 @@ func handleReduceFilled(db *gorm.DB, preOrder *DbModels.LinePreOrder) {
 	}
 	// rate := utility.StringAsFloat(orderExt.AddPositionVal)
 
+	//取消委托中的止盈止损
+	cancelTakeProfitByReduce(db, apiUserInfo, preOrder.Symbol, preOrder.MainId, preOrder.SymbolType)
 	// 100%减仓 终止流程
 	if orderExt.AddPositionVal.Cmp(decimal.NewFromInt(100)) >= 0 {
 		//缓存
@@ -180,6 +162,36 @@ func handleReduceFilled(db *gorm.DB, preOrder *DbModels.LinePreOrder) {
 	}
 }
 
+// 减仓成功后取消止盈止损
+func cancelTakeProfitByReduce(db *gorm.DB, apiUserInfo DbModels.LineApiUser, symbol string, mainId int, symbolType int) {
+	orders, err := GetSymbolTakeAndStop(db, mainId, symbolType)
+	futApi := FutRestApi{}
+
+	if err != nil {
+		logger.Errorf("mainId:%d 获取委托中的止盈止损失败:%v", mainId, err)
+	}
+
+	orderSns := make([]string, 0)
+
+	for _, v := range orders {
+		if v.OrderType != 1 && v.OrderType != 2 {
+			continue
+		}
+
+		orderSns = append(orderSns, v.OrderSn)
+	}
+
+	arr := utility.SplitSlice(orderSns, 10)
+
+	for _, v := range arr {
+		err := futApi.CancelBatchFutOrder(apiUserInfo, symbol, v)
+
+		if err != nil {
+			logger.Errorf("mainId:%d 取消止盈止损失败:%v", mainId, err)
+		}
+	}
+}
+
 // 减仓处理止盈止损
 func FutTakeProfit(db *gorm.DB, preOrder *DbModels.LinePreOrder, apiUserInfo DbModels.LineApiUser, tradeSet models2.TradeSet,
 	positionData positiondto.PositionDto, orderExt DbModels.LinePreOrderExt, manualTakeRatio, manualStopRatio decimal.Decimal) bool {
@@ -267,7 +279,7 @@ func nextFuturesReduceTrigger(db *gorm.DB, mainId int, totalNum decimal.Decimal,
 	//移除缓存
 	key := fmt.Sprintf(rediskey.FuturesReduceList, global.EXCHANGE_BINANCE)
 	vals, _ := helper.DefaultRedis.GetAllList(key)
-	item := positiondto.ReduceListItem{}
+	item := ReduceListItem{}
 
 	for _, val := range vals {
 		sonic.Unmarshal([]byte(val), &item)
@@ -439,8 +451,8 @@ func removeFutLossAndAddPosition(mainId int, orderSn string) {
 	reduceKey := fmt.Sprintf(rediskey.FuturesReduceList, global.EXCHANGE_BINANCE)
 	reduceVal, _ := helper.DefaultRedis.GetAllList(reduceKey)
 	stoploss := dto.StopLossRedisList{}
-	addPosition := positiondto.AddPositionList{}
-	reduce := positiondto.ReduceListItem{}
+	addPosition := AddPositionList{}
+	reduce := ReduceListItem{}
 	//移除减仓后减仓策略
 	RemoveReduceReduceCacheByMainId(mainId, 2)
 
@@ -484,7 +496,7 @@ func removeFutLossAndAddPosition(mainId int, orderSn string) {
 // 处理主单成交，处理止盈、止损、减仓订单
 func handleFutMainOrderFilled(db *gorm.DB, preOrder *models.LinePreOrder, extOrderId int, first bool) {
 	// 获取交易对配置和API信息
-	tradeSet, err := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, preOrder.Symbol, 2)
+	tradeSet, err := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, preOrder.Symbol, 1)
 	mainId := preOrder.Id
 	if err != nil || tradeSet.Coin == "" {
 		logger.Errorf("获取交易对配置失败, 回调订单号：%s, 错误信息: %v", preOrder.OrderSn, err)
@@ -523,7 +535,7 @@ func handleFutMainOrderFilled(db *gorm.DB, preOrder *models.LinePreOrder, extOrd
 		keyFutAddpositionKey := fmt.Sprintf(rediskey.FuturesAddPositionList, global.EXCHANGE_BINANCE)
 
 		for _, addPositionOrder := range addPositionOrders {
-			addPositionData := positiondto.AddPositionList{
+			addPositionData := AddPositionList{
 				Id:         addPositionOrder.Id,
 				OrderSn:    addPositionOrder.OrderSn,
 				MainId:     addPositionOrder.MainId,
@@ -729,7 +741,7 @@ func updateOrderQuantity(db *gorm.DB, order models.LinePreOrder, preOrder *model
 // 减仓单
 func processFutReduceOrder(order DbModels.LinePreOrder, price, num decimal.Decimal) {
 	key := fmt.Sprintf(rediskey.FuturesReduceList, global.EXCHANGE_BINANCE)
-	item := positiondto.ReduceListItem{
+	item := ReduceListItem{
 		Id:      order.Id,
 		ApiId:   order.ApiId,
 		Pid:     order.Pid,
@@ -757,7 +769,7 @@ func processFutReduceOrder(order DbModels.LinePreOrder, price, num decimal.Decim
 // 处理止盈订单
 func processFutTakeProfitOrder(db *gorm.DB, futApi FutRestApi, order models.LinePreOrder, num decimal.Decimal) {
 	price, _ := decimal.NewFromString(order.Price)
-	tradeSet, _ := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, order.Symbol, 2)
+	tradeSet, _ := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, order.Symbol, 1)
 
 	params := FutOrderPlace{
 		ApiId:            order.ApiId,
@@ -794,7 +806,7 @@ func processFutTakeProfitOrder(db *gorm.DB, futApi FutRestApi, order models.Line
 // 处理止损订单
 // order 止损单
 func processFutStopLossOrder(db *gorm.DB, order models.LinePreOrder, price, num decimal.Decimal) error {
-	tradeSet, _ := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, order.Symbol, 2)
+	tradeSet, _ := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, order.Symbol, 1)
 
 	params := FutOrderPlace{
 		ApiId:            order.ApiId,

services/binanceservice/models.go

@@ -61,17 +61,19 @@ type EntryPriceResult struct {
 }
 
 type FutOrderPlace struct {
-	ApiId            int             `json:"api_id"`     //api用户id
-	Symbol           string          `json:"symbol"`     //合约交易对
-	Side             string          `json:"side"`       //购买方向
-	Quantity         decimal.Decimal `json:"quantity"`   //数量
-	Price            decimal.Decimal `json:"price"`      //限价单价
-	SideType         string          `json:"side_type"`  //现价或者市价
-	OpenOrder        int             `json:"open_order"` //是否开启限价单止盈止损
-	Profit           decimal.Decimal `json:"profit"`     //止盈价格
-	StopPrice        decimal.Decimal `json:"stopprice"`  //止损价格
-	OrderType        string          `json:"order_type"` //订单类型，市价或限价MARKET(市价单) TAKE_PROFIT_MARKET（市价止盈） TAKE_PROFIT(限价止盈) STOP (限价止损)  STOP_MARKET（市价止损）
+	ApiId            int             `json:"api_id"`        //api用户id
+	Symbol           string          `json:"symbol"`        //合约交易对
+	Side             string          `json:"side"`          //购买方向
+	PositionSide     string          `json:"position_side"` //持仓方向
+	Quantity         decimal.Decimal `json:"quantity"`      //数量
+	Price            decimal.Decimal `json:"price"`         //限价单价
+	SideType         string          `json:"side_type"`     //现价或者市价
+	OpenOrder        int             `json:"open_order"`    //是否开启限价单止盈止损
+	Profit           decimal.Decimal `json:"profit"`        //止盈价格
+	StopPrice        decimal.Decimal `json:"stopprice"`     //止损价格
+	OrderType        string          `json:"order_type"`    //订单类型，市价或限价MARKET(市价单) TAKE_PROFIT_MARKET（市价止盈） TAKE_PROFIT(限价止盈) STOP (限价止损)  STOP_MARKET（市价止损）
 	NewClientOrderId string          `json:"newClientOrderId"`
+	ClosePosition    bool            `json:"closePosition"` //是否平仓
 }
 
 func (s FutOrderPlace) CheckParams() error {
@@ -186,6 +188,19 @@ type OpenOrders struct {
 	GoodTillDate            int    `json:"goodTillDate"`            //order pre-set auot cancel time for TIF GTD order
 }
 
+// 待触发加仓单
+type AddPositionList struct {
+	Id         int             `json:"id"`     //订单id
+	Pid        int             `json:"pid"`    //父级id
+	MainId     int             `json:"mainId"` //主单Id
+	ApiId      int             `json:"apiId"`  //触发账户id
+	Symbol     string          `json:"symbol"` //交易对
+	Price      decimal.Decimal `json:"price"`  //触发价
+	Side       string          `json:"side"`   //买卖方向
+	SymbolType int             `json:"type" comment:"交易对类别 1-现货 2-合约"`
+	OrderSn    string          `json:"prderSn"`
+}
+
 // SpotAccountInfo 现货账户信息
 type SpotAccountInfo struct {
 	MakerCommission  int `json:"makerCommission"`
@@ -214,3 +229,15 @@ type SpotAccountInfo struct {
 	Permissions []string `json:"permissions"`
 	Uid         int      `json:"uid"`
 }
+
+type ReduceListItem struct {
+	Id      int             `json:"id"`
+	ApiId   int             `json:"apiId"`
+	MainId  int             `json:"mainId"`
+	Pid     int             `json:"pid"`
+	Symbol  string          `json:"symbol"`
+	Price   decimal.Decimal `json:"price"`
+	Side    string          `json:"side"`
+	Num     decimal.Decimal `json:"num"`
+	OrderSn string          `json:"orderSn"`
+}

services/binanceservice/orderservice.go

@@ -1,10 +1,15 @@
 package binanceservice
 
 import (
+	"fmt"
 	"go-admin/app/admin/models"
 	DbModels "go-admin/app/admin/models"
+	"go-admin/pkg/utility"
+	"go-admin/pkg/utility/snowflakehelper"
+	"time"
 
 	"github.com/go-admin-team/go-admin-core/logger"
+	"github.com/jinzhu/copier"
 	"github.com/shopspring/decimal"
 	"gorm.io/gorm"
 )
@@ -129,7 +134,7 @@ func GetTotalLossAmount(db *gorm.DB, mainId int) (decimal.Decimal, error) {
 	return totalLossAmountU, nil
 }
 
-// 获取交易对的 委托中的止盈止损
+// 获取交易对的 委托中的止盈止损、减仓单
 // mainId 主单id
 // symbolType 交易对类型
 func GetSymbolTakeAndStop(db *gorm.DB, mainId int, symbolType int) ([]models.LinePreOrder, error) {
@@ -170,3 +175,69 @@ func GetChildTpOrder(db *gorm.DB, pid int) (int, error) {
 
 	return int(count), nil
 }
+
+// 创建减仓后减仓单
+func CreateReduceReduceOrder(db *gorm.DB, pid int, price, num decimal.Decimal, priceDigit int) (models.LinePreOrder, error) {
+	var preOrder models.LinePreOrder
+	var result models.LinePreOrder
+	var ext models.LinePreOrderExt
+
+	if err := db.Model(&models.LinePreOrder{}).Preload("Childs").Where("id =? ", pid).First(&preOrder).Error; err != nil {
+		return preOrder, err
+	}
+
+	if err := db.Model(&models.LinePreOrderExt{}).Where("order_id =? ", pid).Find(&ext).Error; err != nil {
+		return preOrder, err
+	}
+
+	copier.Copy(&result, &preOrder)
+
+	result.Id = 0
+	result.OrderSn = utility.Int64ToString(snowflakehelper.GetOrderId())
+	result.Status = 0
+	result.CreatedAt = time.Now()
+	result.TriggerTime = nil
+	result.UpdatedAt = time.Now()
+	result.BuyPrice = decimal.Zero.String()
+	result.Price = price.String()
+	result.Num = num.String()
+	result.ReduceOrderId = preOrder.Id
+
+	for index := range result.Childs {
+		result.Childs[index].Id = 0
+		result.Childs[index].OrderSn = utility.Int64ToString(snowflakehelper.GetOrderId())
+		result.Childs[index].Status = 0
+		result.Childs[index].CreatedAt = time.Now()
+		result.Childs[index].TriggerTime = nil
+		result.Childs[index].UpdatedAt = time.Now()
+		result.Childs[index].BuyPrice = decimal.Zero.String()
+		var pricePercent decimal.Decimal
+
+		if result.Childs[index].OrderType == 1 && ext.TakeProfitRatio.Cmp(decimal.Zero) > 0 {
+			// 减仓单卖出
+			if preOrder.Site == "SELL" {
+				pricePercent = decimal.NewFromInt(100).Add(ext.TakeProfitRatio).Div(decimal.NewFromInt(100))
+			} else {
+				pricePercent = decimal.NewFromInt(100).Sub(ext.TakeProfitRatio).Div(decimal.NewFromInt(100))
+			}
+
+		} else if result.Childs[index].OrderType == 2 && ext.StopLossRatio.Cmp(decimal.Zero) > 0 {
+			if preOrder.Site == "SELL" {
+				pricePercent = decimal.NewFromInt(100).Sub(ext.StopLossRatio).Div(decimal.NewFromInt(100))
+			} else {
+				pricePercent = decimal.NewFromInt(100).Add(ext.StopLossRatio).Div(decimal.NewFromInt(100))
+			}
+		}
+
+		//重新计算止盈止损价
+		if pricePercent.Cmp(decimal.Zero) > 0 {
+			result.Childs[index].Price = price.Mul(pricePercent).Truncate(int32(priceDigit)).String()
+		}
+	}
+
+	if err := db.Create(&result).Error; err != nil {
+		return result, fmt.Errorf("复制减仓单失败：pid:%d err:%v", pid, err)
+	}
+
+	return result, nil
+}

services/binanceservice/reduce_order_strategy_service.go

@@ -8,7 +8,6 @@ import (
 	"go-admin/common/global"
 	"go-admin/common/helper"
 	models2 "go-admin/models"
-	"go-admin/models/positiondto"
 	"go-admin/pkg/utility"
 
 	"github.com/bytedance/sonic"
@@ -20,7 +19,7 @@ import (
 // 缓存减仓节点和重新生成
 // reduceOrder:原始减仓单
 // reduceOrderStrategy:减仓策略
-func CacheOrderStrategyAndReCreate(db *gorm.DB, reduceOrder positiondto.ReduceListItem, symbolType int, tradeSet models2.TradeSet, setting models.LineSystemSetting) error {
+func CacheOrderStrategyAndReCreate(db *gorm.DB, reduceOrder ReduceListItem, symbolType int, tradeSet models2.TradeSet, setting models.LineSystemSetting) error {
 	reduceOrderStrategy := models.LineOrderReduceStrategy{}
 	var key string
 

services/binanceservice/reverse_service_test.go

@@ -0,0 +1,34 @@
+package binanceservice
+
+import (
+	"go-admin/common/helper"
+	"testing"
+
+	"github.com/bytedance/sonic"
+	"github.com/go-admin-team/go-admin-core/logger"
+	"github.com/go-admin-team/go-admin-core/sdk"
+	"gorm.io/driver/mysql"
+	"gorm.io/gorm"
+)
+
+func initConfig() *gorm.DB {
+	dsn := "root:123456@tcp(127.0.0.1:3306)/go_exchange_single?charset=utf8mb4&parseTime=True&loc=Local&timeout=1000ms"
+	db, _ := gorm.Open(mysql.Open(dsn), &gorm.Config{})
+	sdk.Runtime.SetDb("default", db)
+	helper.InitDefaultRedis("127.0.0.1:6379", "", 2)
+	helper.InitLockRedisConn("127.0.0.1:6379", "", "2")
+
+	return db
+}
+func TestReverseOrder(t *testing.T) {
+	db := initConfig()
+	mapData := make(map[string]interface{})
+	content := `{"s":"ADAUSDT","c":"439301585084878848","S":"SELL","o":"LIMIT","f":"GTC","q":"8","p":"0.7781","ap":"0.7843","sp":"0","x":"TRADE","X":"FILLED","i":56468022240,"l":"8","z":"8","L":"0.7843","n":"0.0031372","N":"USDT","T":1753950025820,"t":1642816051,"b":"0","a":"0","m":false,"R":false,"wt":"CONTRACT_PRICE","ot":"LIMIT","ps":"SHORT","cp":false,"rp":"0","pP":false,"si":0,"ss":0,"V":"EXPIRE_MAKER","pm":"NONE","gtd":0}`
+	sonic.Unmarshal([]byte(content), &mapData)
+
+	service := ReverseService{}
+	service.Orm = db
+	service.Log = logger.NewHelper(logger.DefaultLogger)
+
+	service.ReverseOrder("c8ej2vxXzNUIlCjQCmU1iavK8LG78uZaXY3CIT4kz0PuhnXycg44HsVAbsqupHTw", mapData)
+}

services/binanceservice/spot_judge_service_test.go

@@ -6,7 +6,6 @@ import (
 	"go-admin/common/global"
 	"go-admin/common/helper"
 	"go-admin/models"
-	"go-admin/models/positiondto"
 	"go-admin/services/cacheservice"
 	"testing"
 
@@ -30,7 +29,7 @@ func TestSpotJudge(t *testing.T) {
 
 	key := fmt.Sprintf(rediskey.SpotReduceList, global.EXCHANGE_BINANCE)
 	item := `{"id":66,"apiId":49,"mainId":63,"pid":63,"symbol":"ADAUSDT","price":"0.5912","side":"SELL","num":"12.6","orderSn":"397919643961917440"}`
-	reduceOrder := positiondto.ReduceListItem{}
+	reduceOrder := ReduceListItem{}
 	spotApi := SpotRestApi{}
 	setting, err := cacheservice.GetSystemSetting(db)
 

services/binanceservice/spotjudgeservice.go

@@ -10,11 +10,8 @@ import (
 	"go-admin/common/global"
 	"go-admin/common/helper"
 	"go-admin/models"
-	"go-admin/models/positiondto"
 	"go-admin/pkg/utility"
 	"go-admin/services/cacheservice"
-	"go-admin/services/commonservice"
-	"go-admin/services/orderservice"
 	"strings"
 	"time"
 
@@ -30,16 +27,13 @@ import (
 func JudgeSpotPrice(trade models.TradeSet) {
 	key := fmt.Sprintf(rediskey.PreSpotOrderList, global.EXCHANGE_BINANCE)
 	preOrderVal, _ := helper.DefaultRedis.GetAllList(key)
-	db := commonservice.GetDBConnection()
+	db := GetDBConnection()
 
 	if len(preOrderVal) == 0 {
 		return
 	}
 
 	spotApi := SpotRestApi{}
-	orderService := orderservice.OrderService{}
-	orderService.Orm = db
-
 	for _, item := range preOrderVal {
 		preOrder := dto.PreOrderRedisList{}
 		if err := sonic.Unmarshal([]byte(item), &preOrder); err != nil {
@@ -52,18 +46,6 @@ func JudgeSpotPrice(trade models.TradeSet) {
 			tradePrice, _ := decimal.NewFromString(trade.LastPrice)
 			//买入
 			if strings.ToUpper(preOrder.Site) == "BUY" && orderPrice.Cmp(tradePrice) >= 0 && orderPrice.Cmp(decimal.Zero) > 0 && tradePrice.Cmp(decimal.Zero) > 0 {
-				//判断个人websocket是否超时
-
-				apiInfo, _ := GetApiInfo(preOrder.ApiId)
-				if err := commonservice.JudgeWebsocketTimeout(apiInfo.ApiKey, 1); err != nil {
-					log.Errorf("现货行情订阅超时,apiKey:%s err:%v", err)
-
-					if err1 := orderService.ErrorTrigger(&preOrder, fmt.Sprintf("行情触发失败,err:%v", err)); err1 != nil {
-						log.Error("触发失败", err1)
-					}
-					continue
-				}
-
 				SpotOrderLock(db, &preOrder, item, spotApi)
 			}
 		}
@@ -158,7 +140,7 @@ func JudgeSpotStopLoss(trade models.TradeSet) {
 		return
 	}
 
-	db := commonservice.GetDBConnection()
+	db := GetDBConnection()
 	spotApi := SpotRestApi{}
 	setting, err := cacheservice.GetSystemSetting(db)
 
@@ -167,7 +149,7 @@ func JudgeSpotStopLoss(trade models.TradeSet) {
 		return
 	}
 
-	tradeSet, err := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, trade.Coin+trade.Currency, 1)
+	tradeSet, err := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, trade.Coin+trade.Currency, 0)
 
 	if err != nil {
 		log.Error("获取交易设置失败")
@@ -275,7 +257,7 @@ func SpotStopLossTrigger(db *gorm.DB, stopOrder dto.StopLossRedisList, spotApi S
 // 判断是否触发现货减仓
 func JudgeSpotReduce(trade models.TradeSet) {
 	key := fmt.Sprintf(rediskey.SpotReduceList, global.EXCHANGE_BINANCE)
-	db := commonservice.GetDBConnection()
+	db := GetDBConnection()
 	spotApi := SpotRestApi{}
 	setting, err := cacheservice.GetSystemSetting(db)
 
@@ -284,14 +266,12 @@ func JudgeSpotReduce(trade models.TradeSet) {
 		return
 	}
 
-	reduceOrder := positiondto.ReduceListItem{}
+	reduceOrder := ReduceListItem{}
 	tradePrice, _ := decimal.NewFromString(trade.LastPrice)
 	//减仓单减仓策略
 	reduceReduceListKey := fmt.Sprintf(rediskey.SpotOrderReduceStrategyList, global.EXCHANGE_BINANCE)
 	orderReduceVal, _ := helper.DefaultRedis.HGetAllFields(reduceReduceListKey)
 	reduceOrderStrategy := dto.LineOrderReduceStrategyResp{}
-	orderService := orderservice.OrderService{}
-	orderService.Orm = db
 
 	for _, item := range orderReduceVal {
 		sonic.Unmarshal([]byte(item), &reduceOrderStrategy)
@@ -317,7 +297,7 @@ func JudgeSpotReduce(trade models.TradeSet) {
 							return
 						}
 
-						order, err := orderService.CreateReduceReduceOrder(db, reduceOrderStrategy.OrderId, item2.Price, item2.Num, trade.PriceDigit)
+						order, err := CreateReduceReduceOrder(db, reduceOrderStrategy.OrderId, item2.Price, item2.Num, trade.PriceDigit)
 
 						if err != nil {
 							log.Errorf("%d 生成订单失败", reduceOrderStrategy.OrderId)
@@ -387,8 +367,8 @@ func JudgeSpotReduce(trade models.TradeSet) {
 // 触发现货减仓
 // isStrategy 是否是策略减仓单
 // reduceId 策略主减仓单id
-func SpotReduceTrigger(db *gorm.DB, reduceOrder positiondto.ReduceListItem, spotApi SpotRestApi, setting DbModels.LineSystemSetting, key, item string, isStrategy bool, reduceId int) bool {
-	tradeSet, err := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, reduceOrder.Symbol, 1)
+func SpotReduceTrigger(db *gorm.DB, reduceOrder ReduceListItem, spotApi SpotRestApi, setting DbModels.LineSystemSetting, key, item string, isStrategy bool, reduceId int) bool {
+	tradeSet, err := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, reduceOrder.Symbol, 0)
 	result := true
 
 	if err != nil {
@@ -490,7 +470,7 @@ func SpotReduceTrigger(db *gorm.DB, reduceOrder positiondto.ReduceListItem, spot
 func JudgeSpotAddPosition(trade models.TradeSet) {
 	key := fmt.Sprintf(rediskey.SpotAddPositionList, global.EXCHANGE_BINANCE)
 	preOrderVal, _ := helper.DefaultRedis.GetAllList(key)
-	db := commonservice.GetDBConnection()
+	db := GetDBConnection()
 
 	if len(preOrderVal) == 0 {
 		return
@@ -498,7 +478,7 @@ func JudgeSpotAddPosition(trade models.TradeSet) {
 
 	spotApi := SpotRestApi{}
 	for _, item := range preOrderVal {
-		preOrder := positiondto.AddPositionList{}
+		preOrder := AddPositionList{}
 		if err := sonic.Unmarshal([]byte(item), &preOrder); err != nil {
 			log.Error("反序列化失败")
 			continue
@@ -515,7 +495,7 @@ func JudgeSpotAddPosition(trade models.TradeSet) {
 	}
 }
 
-func SpotAddPositionTrigger(db *gorm.DB, v *positiondto.AddPositionList, item string, spotApi SpotRestApi) {
+func SpotAddPositionTrigger(db *gorm.DB, v *AddPositionList, item string, spotApi SpotRestApi) {
 	lock := helper.NewRedisLock(fmt.Sprintf(rediskey.SpotTrigger, v.ApiId, v.Symbol), 20, 5, 100*time.Millisecond)
 
 	if ok, err := lock.AcquireWait(context.Background()); err != nil {
@@ -525,7 +505,7 @@ func SpotAddPositionTrigger(db *gorm.DB, v *positiondto.AddPositionList, item st
 		defer lock.Release()
 
 		setting, _ := cacheservice.GetSystemSetting(db)
-		tradeSet, _ := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, v.Symbol, 1)
+		tradeSet, _ := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, v.Symbol, 0)
 
 		if tradeSet.LastPrice == "" {
 			log.Errorf("现货加仓触发 查询交易对失败 交易对：%s ordersn:%s", v.Symbol, v.OrderSn)

services/binanceservice/spotreset.go

@@ -14,7 +14,6 @@ import (
 	"go-admin/models/positiondto"
 	"go-admin/pkg/utility"
 	"go-admin/services/cacheservice"
-	"go-admin/services/commonservice"
 	"go-admin/services/positionservice"
 	"strconv"
 	"strings"
@@ -22,7 +21,6 @@ import (
 
 	"github.com/bytedance/sonic"
 	"github.com/go-admin-team/go-admin-core/logger"
-	log "github.com/go-admin-team/go-admin-core/logger"
 	"github.com/shopspring/decimal"
 	"gorm.io/gorm"
 )
@@ -30,7 +28,7 @@ import (
 /*
 订单回调
 */
-func ChangeSpotOrder(mapData map[string]interface{}) {
+func ChangeSpotOrder(mapData map[string]interface{}, apiKey string) {
 	// 检查订单号是否存在
 	orderSn, ok := mapData["c"]
 	originOrderSn := mapData["C"] //取消操作 代表原始订单号
@@ -45,7 +43,7 @@ func ChangeSpotOrder(mapData map[string]interface{}) {
 	}
 
 	// 获取数据库连接
-	db := commonservice.GetDBConnection()
+	db := GetDBConnection()
 	if db == nil {
 		logger.Error("订单回调失败, 无法获取数据库连接")
 		return
@@ -167,7 +165,7 @@ func handleMainReduceFilled(db *gorm.DB, preOrder *DbModels.LinePreOrder) {
 		return
 	}
 
-	tradeSet, err := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, preOrder.Symbol, 1)
+	tradeSet, err := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, preOrder.Symbol, 0)
 
 	if err != nil {
 		logger.Errorf("handleMainReduceFilled 获取交易对设置失败,订单号:%s", preOrder.OrderSn)
@@ -194,7 +192,7 @@ func handleMainReduceFilled(db *gorm.DB, preOrder *DbModels.LinePreOrder) {
 	lock := helper.NewRedisLock(fmt.Sprintf(rediskey.SpotReduceCallback, preOrder.ApiId, preOrder.Symbol), 120, 20, 100*time.Millisecond)
 
 	if ok, err := lock.AcquireWait(context.Background()); err != nil {
-		log.Error("获取锁失败", err)
+		logger.Error("获取锁失败", err)
 		return
 	} else if ok {
 		defer lock.Release()
@@ -301,7 +299,7 @@ func nextSpotReduceTrigger(db *gorm.DB, mainId int, totalNum decimal.Decimal, tr
 	//移除缓存
 	key := fmt.Sprintf(rediskey.SpotReduceList, global.EXCHANGE_BINANCE)
 	vals, _ := helper.DefaultRedis.GetAllList(key)
-	item := positiondto.ReduceListItem{}
+	item := ReduceListItem{}
 
 	for _, val := range vals {
 		sonic.Unmarshal([]byte(val), &item)
@@ -554,8 +552,8 @@ func removeSpotLossAndAddPosition(mainId int, orderSn string) {
 	reduceKey := fmt.Sprintf(rediskey.SpotReduceList, global.EXCHANGE_BINANCE)
 	reduceVal, _ := helper.DefaultRedis.GetAllList(reduceKey)
 	stoploss := dto.StopLossRedisList{}
-	addPosition := positiondto.AddPositionList{}
-	reduce := positiondto.ReduceListItem{}
+	addPosition := AddPositionList{}
+	reduce := ReduceListItem{}
 
 	//移除减仓后减仓策略
 	RemoveReduceReduceCacheByMainId(mainId, 1)
@@ -647,7 +645,7 @@ func handleMainOrderFilled(db *gorm.DB, preOrder *DbModels.LinePreOrder) {
 		keySpotAddPosition := fmt.Sprintf(rediskey.SpotAddPositionList, global.EXCHANGE_BINANCE)
 
 		for _, addPositionOrder := range addPositionOrders {
-			addPositionData := positiondto.AddPositionList{
+			addPositionData := AddPositionList{
 				Id:         addPositionOrder.Id,
 				OrderSn:    addPositionOrder.OrderSn,
 				MainId:     addPositionOrder.MainId,
@@ -745,7 +743,7 @@ func updateOrderStatus(db *gorm.DB, preOrder *models.LinePreOrder, status int, r
 // fist 首次止盈止损
 func processTakeProfitAndStopLossOrders(db *gorm.DB, preOrder *models.LinePreOrder, positionData *positiondto.PositionDto, extOrderId int, fist bool) {
 	orders := []models.LinePreOrder{}
-	tradeSet, _ := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, preOrder.Symbol, 1)
+	tradeSet, _ := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, preOrder.Symbol, 0)
 	mainId := preOrder.Id
 
 	if preOrder.MainId > 0 {
@@ -856,7 +854,7 @@ func SetPrice(order *models.LinePreOrder, preOrder *models.LinePreOrder, tradeSe
 // 现货减仓
 func processSpotReduceOrder(preOrder DbModels.LinePreOrder) {
 	key := fmt.Sprintf(rediskey.SpotReduceList, global.EXCHANGE_BINANCE)
-	item := positiondto.ReduceListItem{
+	item := ReduceListItem{
 		Id:      preOrder.Id,
 		ApiId:   preOrder.ApiId,
 		Pid:     preOrder.Pid,
@@ -883,7 +881,7 @@ func processSpotReduceOrder(preOrder DbModels.LinePreOrder) {
 
 // 处理止盈订单
 func processTakeProfitOrder(db *gorm.DB, spotApi SpotRestApi, order models.LinePreOrder) {
-	tradeSet, _ := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, order.Symbol, 1)
+	tradeSet, _ := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, order.Symbol, 0)
 
 	if tradeSet.Coin == "" {
 		logger.Error("获取交易对失败")

services/binanceservice/strategy_order_service.go

@@ -12,30 +12,42 @@ import (
 	models2 "go-admin/models"
 	"go-admin/pkg/utility"
 	"go-admin/services/cacheservice"
+	"strings"
 	"time"
 
 	"github.com/bytedance/sonic"
+	"github.com/go-admin-team/go-admin-core/logger"
 	"github.com/go-admin-team/go-admin-core/sdk/service"
 	"github.com/shopspring/decimal"
+	"gorm.io/gorm"
 )
 
 type BinanceStrategyOrderService struct {
 	service.Service
+	Debug bool
 }
 
 // 判断是否触发波段订单
 func (e *BinanceStrategyOrderService) TriggerStrategyOrder(exchangeType string) {
 	//现货
-	orderStrs, _ := helper.DefaultRedis.GetAllList(fmt.Sprintf(rediskey.StrategyFutOrderList, exchangeType))
-	e.DoJudge(orderStrs, 1, exchangeType)
+	orderStrs, _ := helper.DefaultRedis.GetAllList(fmt.Sprintf(rediskey.StrategySpotOrderList, exchangeType))
+	if len(orderStrs) > 0 {
+		e.DoJudge(orderStrs, 1, exchangeType)
+	}
 
 	//合约
 	futOrdedrStrs, _ := helper.DefaultRedis.GetAllList(fmt.Sprintf(rediskey.StrategyFutOrderList, exchangeType))
-	e.DoJudge(futOrdedrStrs, 2, exchangeType)
+
+	if len(futOrdedrStrs) > 0 {
+		e.DoJudge(futOrdedrStrs, 2, exchangeType)
+	}
 }
 
-// 处理订单
+// 判断是否符合条件
 func (e *BinanceStrategyOrderService) DoJudge(orderStrs []string, symbolType int, exchangeType string) {
+	db := GetDBConnection()
+	// setting, _ := cacheservice.GetSystemSetting(db)
+
 	for _, orderStr := range orderStrs {
 		var lockKey string
 		orderItem := dto.StrategyOrderRedisList{}
@@ -51,7 +63,7 @@ func (e *BinanceStrategyOrderService) DoJudge(orderStrs []string, symbolType int
 			lockKey = rediskey.StrategyFutTriggerLock
 		}
 
-		lock := helper.NewRedisLock(fmt.Sprintf(lockKey, orderItem.ApiId, orderItem.Symbol), 200, 50, 100*time.Millisecond)
+		lock := helper.NewRedisLock(fmt.Sprintf(lockKey, orderItem.ApiId, orderItem.OrderSn), 60, 20, 300*time.Millisecond)
 
 		if ok, err := lock.AcquireWait(context.Background()); err != nil {
 			e.Log.Debug("获取锁失败", err)
@@ -60,14 +72,14 @@ func (e *BinanceStrategyOrderService) DoJudge(orderStrs []string, symbolType int
 			defer lock.Release()
 
 			//判断是否符合条件
-			success, err := e.JudgeStrategy(orderItem, 1, exchangeType)
+			success, err := e.JudgeStrategy(orderItem, symbolType, exchangeType)
 
 			if err != nil {
 				e.Log.Errorf("order_id:%d err:%v", orderItem.Id, err)
 			}
 
-			if success {
-				e.TriggerOrder(orderItem, symbolType)
+			if e.Debug || success {
+				e.TriggerOrder(db, orderStr, orderItem, symbolType)
 			}
 		}
 	}
@@ -95,8 +107,16 @@ func (e *BinanceStrategyOrderService) JudgeStrategy(order dto.StrategyOrderRedis
 	}
 
 	score := lastPrices[0].Score
-	startPrice := utility.StrToDecimal(beforePrice)
-	lastPrice := utility.StrToDecimal(lastPrices[0].Member.(string))
+	var startPrice decimal.Decimal
+	var lastPrice decimal.Decimal
+	startPriceArgs := strings.Split(beforePrice, ":")
+	endPricecArgs := strings.Split(lastPrices[0].Member.(string), ":")
+
+	if len(startPriceArgs) == 0 || len(endPricecArgs) == 0 {
+		return result, errors.New("获取交易对起止价格失败")
+	}
+	startPrice = utility.StrToDecimal(startPriceArgs[len(startPriceArgs)-1])
+	lastPrice = utility.StrToDecimal(endPricecArgs[len(endPricecArgs)-1])
 
 	//时间差超过10s
 	if (nowUtc-int64(score))/1000 > 10 {
@@ -108,31 +128,35 @@ func (e *BinanceStrategyOrderService) JudgeStrategy(order dto.StrategyOrderRedis
 	}
 
 	percentag := lastPrice.Div(startPrice).Sub(decimal.NewFromInt(1)).Truncate(6)
-
+	logger.Infof("百分比:%s", percentag.Mul(decimal.NewFromInt(100)).String())
 	//价格没有变动
 	if percentag.Cmp(decimal.Zero) == 0 {
 		return result, nil
 	}
 
 	//满足条件
-	switch order.CompareType {
-	case 1:
-		result = percentag.Mul(decimal.NewFromInt(100)).Cmp(order.Percentag) > 0
-	case 2:
-		result = percentag.Mul(decimal.NewFromInt(100)).Cmp(order.Percentag) >= 0
-	case 5:
-		result = percentag.Mul(decimal.NewFromInt(100)).Cmp(order.Percentag) == 0
-	default:
-		return result, errors.New("没有对应的类型")
+	switch {
+	//涨价格大于0.5% 跌价格小于-0.5%
+	case order.CompareType == 1 && order.Direction == 1 && percentag.Cmp(decimal.Zero) > 0,
+		order.CompareType == 1 && order.Direction == 2 && percentag.Cmp(decimal.Zero) < 0:
+		result = percentag.Abs().Mul(decimal.NewFromInt(100)).Cmp(order.Percentag) > 0
+
+	case order.CompareType == 2 && order.Direction == 1 && percentag.Cmp(decimal.Zero) > 0,
+		order.CompareType == 2 && order.Direction == 2 && percentag.Cmp(decimal.Zero) < 0:
+		result = percentag.Abs().Mul(decimal.NewFromInt(100)).Cmp(order.Percentag) >= 0
+
+	case order.CompareType == 5 && order.Direction == 1 && percentag.Cmp(decimal.Zero) > 0,
+		order.CompareType == 5 && order.Direction == 2 && percentag.Cmp(decimal.Zero) < 0:
+		result = percentag.Abs().Mul(decimal.NewFromInt(100)).Cmp(order.Percentag) == 0
 	}
 
 	return result, nil
 }
 
 // 触发委托单
-func (e *BinanceStrategyOrderService) TriggerOrder(order dto.StrategyOrderRedisList, symbolType int) error {
+func (e *BinanceStrategyOrderService) TriggerOrder(db *gorm.DB, cacheVal string, order dto.StrategyOrderRedisList, symbolType int) error {
 	orders := make([]models.LinePreOrder, 0)
-	if err := e.Orm.Model(&models.LinePreOrder{}).Where("main_id =?", order.Id).Find(&orders).Error; err != nil {
+	if err := e.Orm.Model(&models.LinePreOrder{}).Where("main_id =? or id =?", order.Id, order.Id).Find(&orders).Error; err != nil {
 		e.Log.Errorf("order_id:%d 获取委托单失败:%s", order.Id, err.Error())
 		return err
 	}
@@ -143,7 +167,16 @@ func (e *BinanceStrategyOrderService) TriggerOrder(order dto.StrategyOrderRedisL
 		return errors.New("获取系统设置失败")
 	}
 
-	tradeSet, _ := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, order.Symbol, symbolType)
+	var tradeSet models2.TradeSet
+
+	switch symbolType {
+	case 1:
+		tradeSet, _ = cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, order.Symbol, 0)
+	case 2:
+		tradeSet, _ = cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, order.Symbol, 1)
+	default:
+		return errors.New("获取交易对行情失败,交易对类型错误")
+	}
 
 	if tradeSet.Coin == "" {
 		return errors.New("获取交易对行情失败")
@@ -155,7 +188,7 @@ func (e *BinanceStrategyOrderService) TriggerOrder(order dto.StrategyOrderRedisL
 		return errors.New("最新成交价小于等于0")
 	}
 
-	var mainOrder models.LinePreOrder
+	mainOrder := models.LinePreOrder{}
 
 	for _, v := range orders {
 		if v.MainId == 0 {
@@ -164,62 +197,307 @@ func (e *BinanceStrategyOrderService) TriggerOrder(order dto.StrategyOrderRedisL
 		}
 	}
 
+	if mainOrder.Id == 0 {
+		return errors.New("获取主单失败")
+	}
+
 	GetOrderByPid(&mainOrder, orders, mainOrder.Id)
 
+	e.RecalculateOrder(tradeSet, &mainOrder, setting)
+
+	//事务保存
+	err := e.Orm.Transaction(func(tx *gorm.DB) error {
+		if err1 := tx.Save(&mainOrder).Error; err1 != nil {
+			return err1
+		}
+
+		for _, v := range mainOrder.Childs {
+			if err1 := tx.Save(&v).Error; err1 != nil {
+				return err1
+			}
+
+			for _, v2 := range v.Childs {
+				if err1 := tx.Save(&v2).Error; err1 != nil {
+					return err1
+				}
+			}
+		}
+
+		return nil
+	})
+
+	if err != nil {
+		e.Log.Errorf("order_id:%d 波段触发保存委托单失败:%s", mainOrder.Id, err.Error())
+		return err
+	}
+
+	e.StrategyOrderPlace(db, cacheVal, mainOrder, tradeSet)
+
 	return nil
 }
 
+// 策略触发订单
+// cacheVal:缓存值
+// mainOrder:主订单
+// tradeSet:交易对行情
+func (e *BinanceStrategyOrderService) StrategyOrderPlace(db *gorm.DB, cacheVal string, mainOrder models.LinePreOrder, tradeSet models2.TradeSet) {
+	price := utility.StringToDecimal(mainOrder.Price).Truncate(int32(tradeSet.PriceDigit))
+	num := utility.StringToDecimal(mainOrder.Num).Truncate(int32(tradeSet.AmountDigit))
+	futApi := FutRestApi{}
+	var key string
+
+	switch mainOrder.SymbolType {
+	case 1:
+		key = fmt.Sprintf(rediskey.StrategySpotOrderList, global.EXCHANGE_BINANCE)
+	case 2:
+		key = fmt.Sprintf(rediskey.StrategyFutOrderList, global.EXCHANGE_BINANCE)
+	default:
+		logger.Errorf("id:%d 交易对类型不存在:%d", mainOrder.Id, mainOrder.SymbolType)
+		return
+	}
+
+	params := FutOrderPlace{
+		ApiId:            mainOrder.ApiId,
+		Symbol:           mainOrder.Symbol,
+		Side:             mainOrder.Site,
+		OrderType:        mainOrder.MainOrderType,
+		SideType:         mainOrder.MainOrderType,
+		Price:            price,
+		Quantity:         num,
+		NewClientOrderId: mainOrder.OrderSn,
+	}
+
+	if err := futApi.OrderPlaceLoop(db, params, 3); err != nil {
+		logger.Error("下单失败", mainOrder.Symbol, " err:", err)
+		if _, err := helper.DefaultRedis.LRem(key, cacheVal); err != nil {
+			logger.Error("删除redis 预下单失败:", err)
+		}
+
+		err := db.Model(&models.LinePreOrder{}).Where("id =? and status='0'", mainOrder.Id).Updates(map[string]interface{}{"status": "2", "desc": err.Error()}).Error
+
+		if err != nil {
+			logger.Error("更新预下单状态失败")
+		}
+
+		return
+	} else {
+		if _, err := helper.DefaultRedis.LRem(key, cacheVal); err != nil {
+			logger.Error("删除redis 预下单失败:", err)
+		}
+	}
+
+	if err := db.Model(&models.LinePreOrder{}).Where("id =? ", mainOrder.Id).Updates(map[string]interface{}{"trigger_time": time.Now()}).Error; err != nil {
+		logger.Error("更新预下单状态失败 ordersn:", mainOrder.OrderSn, " status:1")
+	}
+
+	if err := db.Model(&models.LinePreOrder{}).Where("id =? AND status ='0'", mainOrder.Id).Updates(map[string]interface{}{"status": "1"}).Error; err != nil {
+		logger.Error("更新预下单状态失败 ordersn:", mainOrder.OrderSn, " status:1")
+	}
+}
+
 // 重新计算订单单价、数量
 // tradeSet 交易对行情
 // mainOrder 主订单
 // setting 系统设置
 func (e *BinanceStrategyOrderService) RecalculateOrder(tradeSet models2.TradeSet, mainOrder *models.LinePreOrder, setting models.LineSystemSetting) error {
 	exts := make([]models.LinePreOrderExt, 0)
-	if err := e.Orm.Model(models.LinePreOrderExt{}).Where("main_id =?", mainOrder.Id).Find(&exts).Error; err != nil {
+	if err := e.Orm.Model(models.LinePreOrderExt{}).Where("main_order_id =?", mainOrder.Id).Find(&exts).Error; err != nil {
 		return errors.New("获取拓展信息失败")
 	}
 
+	var newPrice decimal.Decimal
 	lastPrice := utility.StrToDecimal(tradeSet.LastPrice)
 	rate := utility.StrToDecimal(mainOrder.Rate)
-	newPrice := lastPrice.Mul(decimal.NewFromInt(1).Add(rate.Div(decimal.NewFromInt(100)).Truncate(4))).Truncate(int32(tradeSet.PriceDigit))
+	newPrice = lastPrice.Mul(decimal.NewFromInt(1).Add(rate.Div(decimal.NewFromInt(100)).Truncate(4))).Truncate(int32(tradeSet.PriceDigit))
 	buyPrice := utility.StrToDecimal(mainOrder.BuyPrice)
 	totalNum := buyPrice.Div(newPrice).Truncate(int32(tradeSet.AmountDigit))
 
 	mainOrder.SignPrice = lastPrice.String()
 	mainOrder.Price = newPrice.String()
 	mainOrder.Num = totalNum.String()
+	remainQuantity := totalNum
+	var totalLossAmount decimal.Decimal
+	prePrice := lastPrice
 
 	for index := range mainOrder.Childs {
-		//主单止盈
-		if mainOrder.Child[index].OrderType == 1 {
-			var ext models.LinePreOrderExt
+		var ext models.LinePreOrderExt
+		extOrderId := mainOrder.Childs[index].Id
+		takeStopArray := []int{1, 2}
 
-			for _, v := range exts {
-				if v.OrderId == mainOrder.Child[index].Id {
-					ext = v
-					break
-				}
+		//止盈止损 ext拓展id为 pid
+		if utility.ContainsInt(takeStopArray, mainOrder.Childs[index].OrderType) {
+			extOrderId = mainOrder.Childs[index].Pid
+		}
+
+		for _, v := range exts {
+			if v.OrderId == extOrderId {
+				ext = v
+				break
+			}
+		}
+		if ext.Id <= 0 {
+			logger.Errorf("子订单ext不存在 id:%d", mainOrder.Childs[index].Id)
+			continue
+		}
+
+		//主单止盈、止损
+		if mainOrder.Childs[index].Pid == mainOrder.Childs[index].MainId && (mainOrder.Childs[index].OrderType == 1 || mainOrder.Childs[index].OrderType == 2) {
+			var percent decimal.Decimal
+
+			switch {
+			// 加价
+			case mainOrder.Childs[index].OrderType == 1 && mainOrder.Site == "BUY", mainOrder.Childs[index].OrderType == 2 && mainOrder.Site == "SELL":
+				percent = decimal.NewFromInt(100).Add(ext.TakeProfitRatio)
+				//减价
+			case mainOrder.Childs[index].OrderType == 2 && mainOrder.Site == "BUY", mainOrder.Childs[index].OrderType == 1 && mainOrder.Site == "SELL":
+				percent = decimal.NewFromInt(100).Sub(ext.StopLossRatio)
 			}
 
-			if ext.Id > 0 {
-				var percent decimal.Decimal
-				//多
-				if mainOrder.Site == "BUY" {
-					percent = decimal.NewFromInt(100).Add(ext.TakeProfitRatio)
-				} else {
-					percent = decimal.NewFromInt(100).Sub(ext.StopLossRatio)
-				}
+			childPrice := lastPrice.Mul(percent.Div(decimal.NewFromInt(100).Truncate(4))).Truncate(int32(tradeSet.PriceDigit))
+			mainOrder.Childs[index].Price = childPrice.String()
+			mainOrder.Childs[index].Num = totalNum.String()
 
-				childPrice := lastPrice.Mul(percent.Div(decimal.NewFromInt(100).Truncate(4))).Truncate(int32(tradeSet.PriceDigit))
-				mainOrder.Child[index].Price = childPrice.String()
-			}
 		} else {
-			//todo 重新计算
+			lastNum := remainQuantity
+
+			//过期时间
+			if ext.ExpirateHour <= 0 {
+				mainOrder.Childs[index].ExpireTime = time.Now().AddDate(10, 0, 0)
+			} else {
+				mainOrder.Childs[index].ExpireTime = time.Now().Add(time.Hour * time.Duration(ext.ExpirateHour))
+			}
+
+			switch {
+			//加仓单
+			case mainOrder.Childs[index].OrderType == 1 && mainOrder.Childs[index].OrderCategory == 3:
+				var percentage decimal.Decimal
+
+				if mainOrder.Site == "BUY" {
+					percentage = decimal.NewFromInt(1).Sub(ext.PriceRatio.Div(decimal.NewFromInt(100)))
+				} else {
+					percentage = decimal.NewFromInt(1).Add(ext.PriceRatio.Div(decimal.NewFromInt(100)))
+				}
+
+				dataPrice := utility.StrToDecimal(mainOrder.Price).Mul(percentage).Truncate(int32(tradeSet.PriceDigit))
+				mainOrder.Childs[index].Price = dataPrice.String()
+
+				priceDiff := dataPrice.Sub(prePrice).Abs()
+				totalLossAmount = totalLossAmount.Add(lastNum.Mul(priceDiff))
+
+				if ext.AddPositionType == 1 {
+					buyPrice := utility.StrToDecimal(mainOrder.BuyPrice).Mul(utility.SafeDiv(ext.AddPositionVal, decimal.NewFromInt(100))).Truncate(2)
+					mainOrder.Childs[index].Num = utility.SafeDiv(buyPrice, dataPrice).Truncate(int32(tradeSet.AmountDigit)).String()
+
+				} else {
+					mainOrder.Childs[index].Num = utility.SafeDiv(ext.AddPositionVal.Truncate(2), dataPrice).Truncate(int32(tradeSet.AmountDigit)).String()
+				}
+
+				//加库存
+				lastNum = lastNum.Add(utility.StrToDecimal(mainOrder.Childs[index].Num))
+				// 计算子订单
+				if len(mainOrder.Childs[index].Childs) > 0 {
+					calculateChildOrder(&mainOrder.Childs[index].Childs, &tradeSet, ext, lastNum, dataPrice, totalLossAmount, false)
+				}
+				//覆盖最近的订单价
+				prePrice = dataPrice
+				//减仓单
+			case mainOrder.Childs[index].OrderType == 4:
+				percentage := decimal.NewFromInt(1)
+
+				if mainOrder.Site == "BUY" && ext.PriceRatio.Cmp(decimal.Zero) > 0 {
+					percentage = decimal.NewFromInt(1).Sub(ext.PriceRatio.Div(decimal.NewFromInt(100)))
+				} else if ext.PriceRatio.Cmp(decimal.Zero) > 0 {
+					percentage = decimal.NewFromInt(1).Add(ext.PriceRatio.Div(decimal.NewFromInt(100)))
+				}
+
+				dataPrice := utility.StrToDecimal(mainOrder.Price).Mul(percentage).Truncate(int32(tradeSet.PriceDigit))
+				mainOrder.Childs[index].Price = dataPrice.String()
+				priceDiff := dataPrice.Sub(prePrice).Abs()
+				totalLossAmount = totalLossAmount.Add(lastNum.Mul(priceDiff))
+
+				//百分比减仓
+				if ext.AddPositionType == 1 {
+					mainOrder.Childs[index].Num = lastNum.Mul(ext.AddPositionVal.Div(decimal.NewFromInt(100))).Truncate(int32(tradeSet.AmountDigit)).String()
+
+				} else {
+					logger.Error("减仓不能是固定数值")
+				}
+
+				//减库存
+				lastNum = lastNum.Sub(utility.StrToDecimal(mainOrder.Childs[index].Num))
+				// 计算子订单
+				if len(mainOrder.Childs[index].Childs) > 0 {
+					calculateChildOrder(&mainOrder.Childs[index].Childs, &tradeSet, ext, lastNum, dataPrice, totalLossAmount, false)
+				}
+				//覆盖最近的订单价
+				prePrice = dataPrice
+			}
 		}
 	}
 	return nil
 }
 
+// 计算子订单信息
+// isTpTp 是否是止盈后止损止盈
+// totalLossAmount 累计亏损金额
+func calculateChildOrder(orders *[]models.LinePreOrder, tradeSet *models2.TradeSet, ext models.LinePreOrderExt, lastNum decimal.Decimal, price decimal.Decimal, totalLossAmount decimal.Decimal, isTpTp bool) error {
+	for index := range *orders {
+		orderQuantity := lastNum.Truncate(int32(tradeSet.AmountDigit))
+		percentage := decimal.NewFromInt(1)
+		var addPercentage decimal.Decimal
+
+		switch {
+		//止盈
+		case !isTpTp && (*orders)[index].OrderType == 1:
+			addPercentage = ext.TakeProfitRatio
+			if ext.TakeProfitNumRatio.Cmp(decimal.Zero) > 0 {
+				orderQuantity = lastNum.Mul(ext.TakeProfitNumRatio.Div(decimal.NewFromInt(100))).Truncate(int32(tradeSet.AmountDigit))
+			}
+		//止损
+		case !isTpTp && (*orders)[index].OrderType == 2:
+			addPercentage = ext.StopLossRatio
+		//止盈后止盈
+		case isTpTp && (*orders)[index].OrderType == 1:
+			addPercentage = ext.TpTpPriceRatio
+		//止盈后止损
+		case isTpTp && (*orders)[index].OrderType == 2:
+			addPercentage = ext.TpSlPriceRatio
+		}
+
+		switch {
+		//做多止盈、做空止损
+		case (*orders)[index].OrderType == 1 && (*orders)[index].Site == "SELL", (*orders)[index].OrderType == 2 && (*orders)[index].Site == "BUY":
+			percentage = decimal.NewFromInt(100).Add(addPercentage)
+
+			//做多止损、做空止盈
+		case (*orders)[index].OrderType == 2 && (*orders)[index].Site == "SELL", (*orders)[index].OrderType == 1 && (*orders)[index].Site == "BUY":
+			percentage = decimal.NewFromInt(100).Sub(addPercentage)
+		}
+
+		//止盈亏损回本百分比
+		if (*orders)[index].OrderType == 1 && totalLossAmount.Cmp(decimal.Zero) > 0 {
+			lossPercent := totalLossAmount.Div(lastNum).Mul(decimal.NewFromInt(100)).Truncate(2)
+			percentage = percentage.Add(lossPercent)
+		}
+
+		if percentage.Cmp(decimal.Zero) > 0 {
+			percentage = percentage.Div(decimal.NewFromInt(100))
+		}
+
+		orderPrice := price.Mul(percentage).Truncate(int32(tradeSet.PriceDigit))
+		(*orders)[index].Price = orderPrice.String()
+		(*orders)[index].Num = orderQuantity.String()
+		lastOrderQuantity := lastNum.Sub(orderQuantity).Truncate(int32(tradeSet.AmountDigit))
+
+		//止盈后止盈、止盈后止损
+		if len((*orders)[index].Childs) > 0 && lastOrderQuantity.Cmp(decimal.Zero) > 0 {
+			calculateChildOrder(&(*orders)[index].Childs, tradeSet, ext, lastOrderQuantity, orderPrice, decimal.Zero, true)
+		}
+	}
+
+	return nil
+}
+
 // 递归订单树
 func GetOrderByPid(order *models.LinePreOrder, orders []models.LinePreOrder, pid int) {
 	for _, v := range orders {

services/binanceservice/strategy_order_service_test.go

@@ -0,0 +1,26 @@
+package binanceservice
+
+import (
+	"go-admin/common/global"
+	"go-admin/common/helper"
+	"testing"
+
+	"github.com/go-admin-team/go-admin-core/sdk"
+	"gorm.io/driver/mysql"
+	"gorm.io/gorm"
+)
+
+// 测试策略 触发单
+func TestTriggerOrder(t *testing.T) {
+	service := BinanceStrategyOrderService{}
+	dsn := "root:123456@tcp(127.0.0.1:3306)/go_exchange_single?charset=utf8mb4&parseTime=True&loc=Local&timeout=1000ms"
+	db, _ := gorm.Open(mysql.Open(dsn), &gorm.Config{})
+	helper.InitDefaultRedis("127.0.0.1:6379", "", 2)
+	helper.InitLockRedisConn("127.0.0.1:6379", "", "2")
+	sdk.Runtime.SetDb("default", db)
+
+	service.Orm = db
+	service.Debug = true
+
+	service.TriggerStrategyOrder(global.EXCHANGE_BINANCE)
+}

services/bitgetservice/bitget_client.go

@@ -1,447 +0,0 @@
-package bitgetservice
-
-import (
-	"errors"
-	"fmt"
-	"go-admin/common/global"
-	"go-admin/common/helper"
-	"go-admin/common/interfaces"
-	"go-admin/models"
-	"go-admin/pkg/utility"
-	"strconv"
-	"strings"
-
-	"github.com/bytedance/sonic"
-)
-
-// BitgetClient Bitget交易所客户端实现
-type BitgetClient struct {
-	httpClient   *helper.BitgetClient
-	marketClient *BitgetMarketClient // 公开行情客户端
-}
-
-// NewBitgetClient 创建新的Bitget客户端实例
-func NewBitgetClient(apiKey, apiSecret, passphrase, proxyUrl string) (*BitgetClient, error) {
-	httpClient, err := helper.NewBitgetClient(apiKey, apiSecret, passphrase, proxyUrl)
-	if err != nil {
-		return nil, err
-	}
-
-	client := &BitgetClient{
-		httpClient: httpClient,
-	}
-
-	// 初始化公开行情客户端
-	marketConfig := DefaultMarketConfig()
-	client.marketClient = NewBitgetMarketClient(marketConfig)
-
-	return client, nil
-}
-
-// GetExchangeName 获取交易所名称
-func (c *BitgetClient) GetExchangeName() string {
-	return global.EXCHANGE_BITGET
-}
-
-// GetExchangeInfo 获取交易所信息
-func (c *BitgetClient) GetExchangeInfo() (interfaces.ExchangeInfoResponse, error) {
-	restApi := NewBitgetRestApi()
-
-	datas, err := restApi.GetSpotSymbols()
-
-	if err != nil {
-		return interfaces.ExchangeInfoResponse{}, err
-	}
-
-	symbols := make([]interfaces.SymbolInfo, 0, len(datas))
-	for _, item := range datas {
-		symbols = append(symbols, interfaces.SymbolInfo{
-			Symbol:     item.Symbol,
-			BaseAsset:  item.BaseCoin,
-			QuoteAsset: item.QuoteCoin,
-			Status:     item.Status,
-			MinQty:     item.MinQty,
-			MaxQty:     item.MaxQty,
-			StepSize:   strconv.Itoa(item.QuantityDigit),
-			TickSize:   strconv.Itoa(item.PriceDigit),
-		})
-	}
-
-	return interfaces.ExchangeInfoResponse{Symbols: symbols}, nil
-}
-
-// GetSpotTickers 获取所有现货行情
-func (c *BitgetClient) GetSpotTickers() ([]models.TradeSet, error) {
-	params := map[string]interface{}{}
-	resp, _, err := c.httpClient.SendSpotRequestAuth("/api/v2/spot/market/tickers", "GET", params)
-	if err != nil {
-		return nil, fmt.Errorf("获取Bitget现货行情列表失败: %v", err)
-	}
-
-	var response struct {
-		Code string `json:"code"`
-		Msg  string `json:"msg"`
-		Data []struct {
-			Symbol    string `json:"symbol"`
-			High24h   string `json:"high24h"`
-			Low24h    string `json:"low24h"`
-			Close     string `json:"close"`
-			Open      string `json:"open"`
-			Volume24h string `json:"volume24h"`
-			QuoteVol  string `json:"quoteVol"`
-			Change24h string `json:"change24h"`
-			Change    string `json:"change"`
-		} `json:"data"`
-	}
-
-	if err := sonic.Unmarshal(resp, &response); err != nil {
-		return nil, fmt.Errorf("解析Bitget行情列表失败: %v", err)
-	}
-
-	if response.Code != "00000" {
-		return nil, fmt.Errorf("bitget API错误: %s", response.Msg)
-	}
-
-	tradeSets := make([]models.TradeSet, 0, len(response.Data))
-	for _, item := range response.Data {
-		// 解析交易对，获取基础币种和计价币种
-		var coin, currency string
-		if strings.HasSuffix(item.Symbol, "USDT") {
-			coin = strings.TrimSuffix(item.Symbol, "USDT")
-			currency = "USDT"
-		} else if strings.HasSuffix(item.Symbol, "BTC") {
-			coin = strings.TrimSuffix(item.Symbol, "BTC")
-			currency = "BTC"
-		} else if strings.HasSuffix(item.Symbol, "ETH") {
-			coin = strings.TrimSuffix(item.Symbol, "ETH")
-			currency = "ETH"
-		} else {
-			continue // 跳过不支持的交易对
-		}
-
-		tradeSet := models.TradeSet{
-			Coin:        coin,
-			Currency:    currency,
-			LastPrice:   item.Close,
-			HighPrice:   item.High24h,
-			LowPrice:    item.Low24h,
-			Volume:      item.Volume24h,
-			QuoteVolume: item.QuoteVol,
-			OpenPrice:   utility.StringAsFloat(item.Open),
-			PriceChange: utility.StringAsFloat(item.Change),
-		}
-
-		tradeSets = append(tradeSets, tradeSet)
-	}
-
-	return tradeSets, nil
-}
-
-// GetSpotTicker24h 获取现货24小时行情
-func (c *BitgetClient) GetSpotTicker24h(symbol string) (models.Ticker24, error) {
-	params := map[string]interface{}{
-		"symbol": symbol,
-	}
-
-	resp, _, err := c.httpClient.SendSpotRequestAuth("/api/v2/spot/market/ticker", "GET", params)
-	if err != nil {
-		return models.Ticker24{}, fmt.Errorf("获取Bitget现货24h行情失败: %v", err)
-	}
-
-	var response struct {
-		Code string `json:"code"`
-		Msg  string `json:"msg"`
-		Data struct {
-			Symbol    string `json:"symbol"`
-			High24h   string `json:"high24h"`
-			Low24h    string `json:"low24h"`
-			Close     string `json:"close"`
-			Open      string `json:"open"`
-			Volume24h string `json:"volume24h"`
-			QuoteVol  string `json:"quoteVol"`
-			Change24h string `json:"change24h"`
-			Change    string `json:"change"`
-		} `json:"data"`
-	}
-
-	if err := sonic.Unmarshal(resp, &response); err != nil {
-		return models.Ticker24{}, fmt.Errorf("解析Bitget 24h行情失败: %v", err)
-	}
-
-	if response.Code != "00000" {
-		return models.Ticker24{}, fmt.Errorf("Bitget API错误: %s", response.Msg)
-	}
-
-	ticker := models.Ticker24{
-		HighPrice:     response.Data.High24h,
-		LowPrice:      response.Data.Low24h,
-		LastPrice:     response.Data.Close,
-		OpenPrice:     response.Data.Open,
-		Volume:        response.Data.Volume24h,
-		QuoteVolume:   response.Data.QuoteVol,
-		ChangePercent: response.Data.Change,
-	}
-
-	return ticker, nil
-}
-
-// PlaceSpotOrder 下现货订单
-func (c *BitgetClient) PlaceSpotOrder(params interfaces.SpotOrderParams) (interfaces.SpotOrderResponse, error) {
-	orderParams := map[string]interface{}{
-		"symbol":    params.Symbol,
-		"side":      strings.ToLower(params.Side),
-		"orderType": strings.ToLower(params.Type),
-		"quantity":  params.Quantity.String(),
-	}
-
-	if params.Type == "LIMIT" {
-		orderParams["price"] = params.Price.String()
-	}
-
-	if params.TimeInForce != "" {
-		orderParams["timeInForce"] = params.TimeInForce
-	}
-
-	if params.NewClientOrderId != "" {
-		orderParams["clientOrderId"] = params.NewClientOrderId
-	}
-
-	resp, _, err := c.httpClient.SendSpotRequestAuth("/api/v2/spot/trade/orders", "POST", orderParams)
-	if err != nil {
-		return interfaces.SpotOrderResponse{}, fmt.Errorf("Bitget现货下单失败: %v", err)
-	}
-
-	var response struct {
-		Code string `json:"code"`
-		Msg  string `json:"msg"`
-		Data struct {
-			OrderId       string `json:"orderId"`
-			ClientOrderId string `json:"clientOrderId"`
-		} `json:"data"`
-	}
-
-	if err := sonic.Unmarshal(resp, &response); err != nil {
-		return interfaces.SpotOrderResponse{}, fmt.Errorf("解析Bitget下单响应失败: %v", err)
-	}
-
-	if response.Code != "00000" {
-		return interfaces.SpotOrderResponse{}, fmt.Errorf("Bitget下单API错误: %s", response.Msg)
-	}
-
-	orderId, _ := strconv.ParseInt(response.Data.OrderId, 10, 64)
-
-	return interfaces.SpotOrderResponse{
-		Symbol:        params.Symbol,
-		OrderId:       orderId,
-		ClientOrderId: response.Data.ClientOrderId,
-		Price:         params.Price.String(),
-		OrigQty:       params.Quantity.String(),
-		Side:          params.Side,
-		Type:          params.Type,
-		Status:        "NEW",
-	}, nil
-}
-
-// CancelSpotOrder 取消现货订单
-func (c *BitgetClient) CancelSpotOrder(symbol, orderID string) error {
-	params := map[string]interface{}{
-		"symbol":  symbol,
-		"orderId": orderID,
-	}
-
-	resp, _, err := c.httpClient.SendSpotRequestAuth("/api/v2/spot/trade/cancel-order", "POST", params)
-	if err != nil {
-		return fmt.Errorf("Bitget取消现货订单失败: %v", err)
-	}
-
-	var response struct {
-		Code string `json:"code"`
-		Msg  string `json:"msg"`
-	}
-
-	if err := sonic.Unmarshal(resp, &response); err != nil {
-		return fmt.Errorf("解析Bitget取消订单响应失败: %v", err)
-	}
-
-	if response.Code != "00000" {
-		return fmt.Errorf("Bitget取消订单API错误: %s", response.Msg)
-	}
-
-	return nil
-}
-
-// GetSpotOrder 获取现货订单详情
-func (c *BitgetClient) GetSpotOrder(symbol, orderID string) (interfaces.SpotOrderResponse, error) {
-	// 实现订单查询逻辑
-	return interfaces.SpotOrderResponse{}, fmt.Errorf("GetSpotOrder not implemented yet")
-}
-
-// GetSpotOrders 获取现货订单列表
-func (c *BitgetClient) GetSpotOrders(symbol string) ([]interfaces.SpotOrderResponse, error) {
-	params := map[string]interface{}{
-		"symbol": symbol,
-	}
-
-	_, _, err := c.httpClient.SendSpotRequestAuth("/api/v2/spot/trade/open-orders", "GET", params)
-	if err != nil {
-		return nil, fmt.Errorf("获取Bitget现货订单列表失败: %v", err)
-	}
-
-	// 这里需要根据实际的Bitget API响应格式来解析
-	return []interfaces.SpotOrderResponse{}, nil
-}
-
-// 合约相关接口实现（暂时返回错误）
-func (c *BitgetClient) GetFuturesTicker24h(symbol string) (models.Ticker24, error) {
-	return models.Ticker24{}, fmt.Errorf("futures not implemented yet")
-}
-
-func (c *BitgetClient) GetFuturesTickers() ([]models.TradeSet, error) {
-	return nil, fmt.Errorf("futures not implemented yet")
-}
-
-func (c *BitgetClient) PlaceFuturesOrder(params interfaces.FuturesOrderParams) (interfaces.FuturesOrderResponse, error) {
-	return interfaces.FuturesOrderResponse{}, fmt.Errorf("futures not implemented yet")
-}
-
-func (c *BitgetClient) CancelFuturesOrder(symbol, orderID string) error {
-	return fmt.Errorf("futures not implemented yet")
-}
-
-func (c *BitgetClient) GetFuturesOrder(symbol, orderID string) (interfaces.FuturesOrderResponse, error) {
-	return interfaces.FuturesOrderResponse{}, fmt.Errorf("futures not implemented yet")
-}
-
-// WebSocket相关接口实现（已重构为使用公开行情客户端）
-// 注意：这些方法已被重构，现在使用新的公开行情客户端
-// 如需私有数据订阅（如订单、持仓），请使用 BitgetWebSocketManager
-
-// 旧的订阅方法（保留兼容性，但建议使用新方法）
-func (c *BitgetClient) SubscribeSpotTickerLegacy(symbols []string, callback func(models.Ticker24, string, string)) error {
-	return fmt.Errorf("已废弃，请使用 SubscribeSpotTicker(symbol, listener) 方法")
-}
-
-func (c *BitgetClient) SubscribeFuturesTickerLegacy(symbols []string, callback func(models.Ticker24, string, string)) error {
-	return fmt.Errorf("已废弃，请使用 SubscribeFuturesTicker(symbol, listener) 方法")
-}
-
-func (c *BitgetClient) SubscribeSpotDepthLegacy(symbols []string, callback func(models.DepthBin, string, string)) error {
-	return fmt.Errorf("已废弃，请使用 SubscribeSpotDepth(symbol, listener) 方法")
-}
-
-func (c *BitgetClient) SubscribeSpotTradesLegacy(symbols []string, callback func(models.NewDealPush, string, string)) error {
-	return fmt.Errorf("已废弃，请使用 SubscribeSpotTrades(symbol, listener) 方法")
-}
-
-func (c *BitgetClient) SubscribeKlineLegacy(symbols []string, interval string, callback func(models.Kline, int, string, string)) error {
-	return fmt.Errorf("已废弃，请使用 SubscribeKline(symbol, interval, listener) 方法")
-}
-
-func (c *BitgetClient) Close() error {
-	// 关闭HTTP客户端等清理工作
-	return nil
-}
-
-// SetMarketProxy 设置市场数据代理
-func (c *BitgetClient) SetMarketProxy(proxyType, proxyAddress string) {
-	if c.marketClient != nil {
-		c.marketClient.SetProxy(proxyType, proxyAddress)
-	}
-}
-
-// SetMarketListeners 设置市场数据监听器
-func (c *BitgetClient) SetMarketListeners(msgListener, errorListener OnReceive) {
-	if c.marketClient != nil {
-		c.marketClient.SetListeners(msgListener, errorListener)
-	}
-}
-
-// ConnectMarketData 连接市场数据WebSocket
-func (c *BitgetClient) ConnectMarketData() error {
-	if c.marketClient == nil {
-		return errors.New("市场数据客户端未初始化")
-	}
-	return c.marketClient.Connect()
-}
-
-// SubscribeMarketData 订阅市场数据（公开行情）
-func (c *BitgetClient) SubscribeMarketData(subscribeReqs []SubscribeReq, listener OnReceive) error {
-	if c.marketClient == nil {
-		return errors.New("市场数据客户端未初始化")
-	}
-	return c.marketClient.Subscribe(subscribeReqs, listener)
-}
-
-// UnsubscribeMarketData 取消订阅市场数据
-func (c *BitgetClient) UnsubscribeMarketData(subscribeReqs []SubscribeReq) error {
-	if c.marketClient == nil {
-		return errors.New("市场数据客户端未初始化")
-	}
-	return c.marketClient.Unsubscribe(subscribeReqs)
-}
-
-// IsMarketDataConnected 检查市场数据连接状态
-func (c *BitgetClient) IsMarketDataConnected() bool {
-	if c.marketClient == nil {
-		return false
-	}
-	return c.marketClient.IsConnected()
-}
-
-// CloseMarketData 关闭市场数据连接
-func (c *BitgetClient) CloseMarketData() error {
-	if c.marketClient == nil {
-		return nil
-	}
-	return c.marketClient.Close()
-}
-
-// SubscribeSpotTicker 订阅现货行情（使用公开行情客户端）
-func (c *BitgetClient) SubscribeSpotTicker(symbol string, listener OnReceive) error {
-	subscribeReq := SubscribeReq{
-		InstType: "SPOT",
-		Channel:  "ticker",
-		InstId:   symbol,
-	}
-	return c.SubscribeMarketData([]SubscribeReq{subscribeReq}, listener)
-}
-
-// SubscribeFuturesTicker 订阅合约行情（使用公开行情客户端）
-func (c *BitgetClient) SubscribeFuturesTicker(symbol string, listener OnReceive) error {
-	subscribeReq := SubscribeReq{
-		InstType: "UMCBL",
-		Channel:  "ticker",
-		InstId:   symbol,
-	}
-	return c.SubscribeMarketData([]SubscribeReq{subscribeReq}, listener)
-}
-
-// SubscribeSpotDepth 订阅现货深度（使用公开行情客户端）
-func (c *BitgetClient) SubscribeSpotDepth(symbol string, listener OnReceive) error {
-	subscribeReq := SubscribeReq{
-		InstType: "SPOT",
-		Channel:  "books",
-		InstId:   symbol,
-	}
-	return c.SubscribeMarketData([]SubscribeReq{subscribeReq}, listener)
-}
-
-// SubscribeSpotTrades 订阅现货成交（使用公开行情客户端）
-func (c *BitgetClient) SubscribeSpotTrades(symbol string, listener OnReceive) error {
-	subscribeReq := SubscribeReq{
-		InstType: "SPOT",
-		Channel:  "trade",
-		InstId:   symbol,
-	}
-	return c.SubscribeMarketData([]SubscribeReq{subscribeReq}, listener)
-}
-
-// SubscribeKline 订阅K线数据（使用公开行情客户端）
-func (c *BitgetClient) SubscribeKline(symbol, interval string, listener OnReceive) error {
-	subscribeReq := SubscribeReq{
-		InstType: "SPOT",
-		Channel:  "candle" + interval,
-		InstId:   symbol,
-	}
-	return c.SubscribeMarketData([]SubscribeReq{subscribeReq}, listener)
-}

services/bitgetservice/bitget_example.go

@@ -1,229 +0,0 @@
-package bitgetservice
-
-import (
-	log "github.com/go-admin-team/go-admin-core/logger"
-)
-
-// ExampleBitgetMarketClient 展示如何使用Bitget公开行情客户端
-func ExampleBitgetMarketClient() {
-	// 1. 创建Bitget客户端（不需要API密钥用于公开数据）
-	client := &BitgetClient{}
-
-	// 初始化公开行情客户端
-	marketConfig := DefaultMarketConfig()
-	client.marketClient = NewBitgetMarketClient(marketConfig)
-
-	// 2. 设置代理（可选）
-	// client.SetMarketProxy("socks5", "127.0.0.1:1080")
-
-	// 3. 设置消息监听器
-	msgListener := func(message string) {
-		log.Info("收到市场数据: %s", message)
-		// 在这里处理市场数据
-	}
-
-	errorListener := func(message string) {
-		log.Error("收到错误消息: %s", message)
-	}
-
-	client.SetMarketListeners(msgListener, errorListener)
-
-	// 4. 连接WebSocket
-	if err := client.ConnectMarketData(); err != nil {
-		log.Error("连接市场数据失败: %v", err)
-		return
-	}
-
-	// 5. 订阅现货行情
-	tickerListener := func(message string) {
-		log.Info("收到BTC-USDT行情: %s", message)
-	}
-
-	if err := client.SubscribeSpotTicker("BTCUSDT", tickerListener); err != nil {
-		log.Error("订阅现货行情失败: %v", err)
-		return
-	}
-
-	// 6. 订阅深度数据
-	depthListener := func(message string) {
-		log.Info("收到BTC-USDT深度: %s", message)
-	}
-
-	if err := client.SubscribeSpotDepth("BTCUSDT", depthListener); err != nil {
-		log.Error("订阅深度数据失败: %v", err)
-		return
-	}
-
-	// 7. 订阅成交数据
-	tradeListener := func(message string) {
-		log.Info("收到BTC-USDT成交: %s", message)
-	}
-
-	if err := client.SubscribeSpotTrades("BTCUSDT", tradeListener); err != nil {
-		log.Error("订阅成交数据失败: %v", err)
-		return
-	}
-
-	// 8. 订阅K线数据
-	klineListener := func(message string) {
-		log.Info("收到BTC-USDT K线: %s", message)
-	}
-
-	if err := client.SubscribeKline("BTCUSDT", "1m", klineListener); err != nil {
-		log.Error("订阅K线数据失败: %v", err)
-		return
-	}
-
-	log.Info("所有订阅完成，开始接收数据...")
-
-	// 保持连接（在实际应用中，你可能需要其他方式来保持程序运行）
-	// select {}
-}
-
-// ExampleBitgetPrivateWebSocket 展示如何使用私有WebSocket（订单、持仓等）
-func ExampleBitgetPrivateWebSocket() {
-	// 私有数据订阅仍然使用 BitgetWebSocketManager
-	// apiKey := "your_api_key"
-	// secretKey := "your_secret_key"
-	// passphrase := "your_passphrase"
-
-	// // 创建私有WebSocket管理器
-	// manager := GetOrCreateBitgetWebSocketManager(apiKey, secretKey, passphrase, "spot")
-
-	// // 启动连接
-	// if err := manager.Start(); err != nil {
-	// 	log.Error("启动私有WebSocket连接失败: %v", err)
-	// 	return
-	// }
-
-	// log.Info("私有WebSocket连接成功，可以接收订单、持仓等私有数据")
-}
-
-// ExampleMixedUsage 展示混合使用公开和私有订阅
-func ExampleMixedUsage() {
-	// apiKey := "your_api_key"
-	// secretKey := "your_secret_key"
-	// passphrase := "your_passphrase"
-
-	// // 1. 创建完整的Bitget客户端
-	// client, err := NewBitgetClient(apiKey, secretKey, passphrase)
-	// if err != nil {
-	// 	log.Error("创建Bitget客户端失败: %v", err)
-	// 	return
-	// }
-
-	// // 2. 设置公开行情监听器
-	// client.SetMarketListeners(
-	// 	func(message string) {
-	// 		log.Info("公开行情数据: %s", message)
-	// 	},
-	// 	func(message string) {
-	// 		log.Error("公开行情错误: %s", message)
-	// 	},
-	// )
-
-	// // 3. 连接公开行情
-	// if err := client.ConnectMarketData(); err != nil {
-	// 	log.Error("连接公开行情失败: %v", err)
-	// 	return
-	// }
-
-	// // 4. 订阅公开行情
-	// if err := client.SubscribeSpotTicker("BTCUSDT", func(message string) {
-	// 	log.Info("BTC行情: %s", message)
-	// }); err != nil {
-	// 	log.Error("订阅行情失败: %v", err)
-	// 	return
-	// }
-
-	// // 5. 同时使用私有WebSocket（如果需要）
-	// privateManager, err := GetOrCreateBitgetWebSocketManager(apiKey, secretKey, passphrase, "spot")
-	// if err != nil {
-	// 	log.Error("创建私有WebSocket失败: %v", err)
-	// 	return
-	// }
-
-	// if err := privateManager.Start(); err != nil {
-	// 	log.Error("启动私有WebSocket失败: %v", err)
-	// 	return
-	// }
-
-	// log.Info("混合使用设置完成：公开行情 + 私有数据")
-}
-
-// ExampleSubscribeMultipleSymbols 展示如何订阅多个交易对
-func ExampleSubscribeMultipleSymbols() {
-	client := &BitgetClient{}
-	marketConfig := DefaultMarketConfig()
-	client.marketClient = NewBitgetMarketClient(marketConfig)
-
-	// 连接
-	if err := client.ConnectMarketData(); err != nil {
-		log.Error("连接失败: %v", err)
-		return
-	}
-
-	// 批量订阅多个交易对的行情
-	symbols := []string{"BTCUSDT", "ETHUSDT", "ADAUSDT", "DOTUSDT"}
-
-	for _, symbol := range symbols {
-		listener := func(sym string) OnReceive {
-			return func(message string) {
-				log.Info("%s 行情更新: %s", sym, message)
-			}
-		}(symbol)
-
-		if err := client.SubscribeSpotTicker(symbol, listener); err != nil {
-			log.Error("订阅 %s 行情失败: %v", symbol, err)
-		} else {
-			log.Info("成功订阅 %s 行情", symbol)
-		}
-	}
-
-	log.Info("批量订阅完成")
-}
-
-// ExampleCustomSubscription 展示如何使用自定义订阅
-func ExampleCustomSubscription() {
-	client := &BitgetClient{}
-	marketConfig := DefaultMarketConfig()
-	client.marketClient = NewBitgetMarketClient(marketConfig)
-
-	if err := client.ConnectMarketData(); err != nil {
-		log.Error("连接失败: %v", err)
-		return
-	}
-
-	// 自定义订阅请求
-	customSubscriptions := []SubscribeReq{
-		{
-			InstType: "SPOT",
-			Channel:  "ticker",
-			InstId:   "BTCUSDT",
-		},
-		{
-			InstType: "SPOT",
-			Channel:  "books",
-			InstId:   "ETHUSDT",
-		},
-		{
-			InstType: "UMCBL", // 合约
-			Channel:  "ticker",
-			InstId:   "BTCUSDT",
-		},
-	}
-
-	// 统一的消息处理器
-	messageHandler := func(message string) {
-		log.Info("自定义订阅数据: %s", message)
-		// 在这里根据消息内容进行不同的处理
-	}
-
-	// 批量订阅
-	if err := client.SubscribeMarketData(customSubscriptions, messageHandler); err != nil {
-		log.Error("自定义订阅失败: %v", err)
-		return
-	}
-
-	log.Info("自定义订阅完成")
-}

services/bitgetservice/bitget_judge.go

@@ -1,326 +0,0 @@
-package bitgetservice
-
-import (
-	DbModels "go-admin/app/admin/models"
-	"go-admin/models"
-	"go-admin/models/positiondto"
-
-	"gorm.io/gorm"
-)
-
-// JudgeCreateOrder 判断是否需要创建订单
-// symbolType 1:现货 2:合约
-func JudgeCreateOrder(trade models.TradeSet, symbolType int) error {
-	// var key string
-
-	// if symbolType == 1 {
-	// 	key = fmt.Sprintf(rediskey.PreSpotOrderList, global.EXCHANGE_BITGET)
-	// } else if symbolType == 2 {
-	// 	key = fmt.Sprintf(rediskey.PreFutOrderList, global.EXCHANGE_BITGET)
-	// } else {
-	// 	return fmt.Errorf("不支持的交易类型")
-	// }
-
-	// preOrderVal, _ := helper.DefaultRedis.GetAllList(key)
-	// db := commonservice.GetDBConnection()
-
-	// if len(preOrderVal) == 0 {
-	// 	return fmt.Errorf("预订单列表为空")
-	// }
-
-	// // spotApi := SpotRestApi{}
-	// for _, item := range preOrderVal {
-	// 	preOrder := dto.PreOrderRedisList{}
-	// 	if err := sonic.Unmarshal([]byte(item), &preOrder); err != nil {
-	// 		logger.Error("反序列化失败")
-	// 		continue
-	// 	}
-
-	// 	if preOrder.Symbol == trade.Coin+trade.Currency {
-	// 		orderPrice, _ := decimal.NewFromString(preOrder.Price)
-	// 		tradePrice, _ := decimal.NewFromString(trade.LastPrice)
-	// 		//买入
-	// 		if strings.ToUpper(preOrder.Site) == "BUY" && orderPrice.Cmp(tradePrice) >= 0 && orderPrice.Cmp(decimal.Zero) > 0 && tradePrice.Cmp(decimal.Zero) > 0 {
-	// 			// SpotOrderLock(db, &preOrder, item, spotApi)
-	// 		}
-	// 	}
-	// }
-	return nil
-}
-
-// 判断是否触发加仓
-func JudgeAddPositionOrder(trade models.TradeSet, symbolType int) error {
-	// var key string
-
-	// if symbolType == 1 {
-	// 	key = fmt.Sprintf(rediskey.SpotAddPositionList, global.EXCHANGE_BITGET)
-	// } else if symbolType == 2 {
-	// 	key = fmt.Sprintf(rediskey.FuturesAddPositionList, global.EXCHANGE_BITGET)
-	// } else {
-	// 	return fmt.Errorf("不支持的交易类型")
-	// }
-	// preOrderVal, _ := helper.DefaultRedis.GetAllList(key)
-	// db := commonservice.GetDBConnection()
-
-	// if len(preOrderVal) == 0 {
-	// 	return fmt.Errorf("预订单列表为空")
-	// }
-
-	// // spotApi := SpotRestApi{}
-	// for _, item := range preOrderVal {
-	// 	preOrder := positiondto.AddPositionList{}
-	// 	if err := sonic.Unmarshal([]byte(item), &preOrder); err != nil {
-	// 		logger.Error("反序列化失败")
-	// 		continue
-	// 	}
-
-	// 	if preOrder.Symbol == trade.Coin+trade.Currency {
-	// 		orderPrice := preOrder.Price
-	// 		tradePrice, _ := decimal.NewFromString(trade.LastPrice)
-	// 		//买入
-	// 		if strings.ToUpper(preOrder.Side) == "BUY" && orderPrice.Cmp(tradePrice) >= 0 && orderPrice.Cmp(decimal.Zero) > 0 && tradePrice.Cmp(decimal.Zero) > 0 {
-	// 			// SpotAddPositionTrigger(db, &preOrder, item, spotApi)
-	// 		}
-	// 	}
-	// }
-
-	return nil
-}
-
-// JudgeReduceOrder 判断是否需要减仓
-func JudgeReduceOrder(trade models.TradeSet, symbolType int) error {
-	// var key string
-	// var reduceReduceListKey string
-
-	// if symbolType == 1 {
-	// 	key = fmt.Sprintf(rediskey.SpotReduceList, global.EXCHANGE_BITGET)
-	// 	reduceReduceListKey = fmt.Sprintf(rediskey.SpotOrderReduceStrategyList, global.EXCHANGE_BITGET)
-	// } else if symbolType == 2 {
-	// 	key = fmt.Sprintf(rediskey.FuturesReduceList, global.EXCHANGE_BITGET)
-	// 	reduceReduceListKey = fmt.Sprintf(rediskey.FutOrderReduceStrategyList, global.EXCHANGE_BITGET)
-	// } else {
-	// 	return fmt.Errorf("不支持的交易类型")
-	// }
-
-	// db := commonservice.GetDBConnection()
-	// // spotApi := SpotRestApi{}
-	// setting, err := cacheservice.GetSystemSetting(db)
-
-	// if err != nil {
-	// 	logger.Error("获取系统设置失败")
-	// 	return errors.New("获取系统设置失败")
-	// }
-
-	// reduceOrder := positiondto.ReduceListItem{}
-	// tradePrice, _ := decimal.NewFromString(trade.LastPrice)
-	// //减仓单减仓策略
-	// orderReduceVal, _ := helper.DefaultRedis.HGetAllFields(reduceReduceListKey)
-	// reduceOrderStrategy := dto.LineOrderReduceStrategyResp{}
-	// orderService := orderservice.OrderService{}
-	// orderService.Orm = db
-
-	// for _, item := range orderReduceVal {
-	// 	sonic.Unmarshal([]byte(item), &reduceOrderStrategy)
-
-	// 	for index, item2 := range reduceOrderStrategy.Items {
-	// 		if reduceOrderStrategy.Symbol == trade.Coin+trade.Currency {
-	// 			//买入
-	// 			if strings.ToUpper(reduceOrderStrategy.Side) == "SELL" &&
-	// 				item2.TriggerPrice.Cmp(tradePrice) >= 0 &&
-	// 				item2.TriggerPrice.Cmp(decimal.Zero) > 0 &&
-	// 				tradePrice.Cmp(decimal.Zero) > 0 {
-	// 				lock := helper.NewRedisLock(fmt.Sprintf(rediskey.ReduceStrategySpotTriggerLock, reduceOrder.ApiId, reduceOrder.Symbol), 50, 15, 100*time.Millisecond)
-
-	// 				if ok, err := lock.AcquireWait(context.Background()); err != nil {
-	// 					logger.Error("获取锁失败", err)
-	// 					return errors.New("获取锁失败")
-	// 				} else if ok {
-	// 					defer lock.Release()
-	// 					hasrecord, _ := helper.DefaultRedis.HExists(reduceReduceListKey, utility.IntTostring(reduceOrderStrategy.OrderId), item)
-
-	// 					if !hasrecord {
-	// 						logger.Debug("减仓缓存中不存在", item)
-	// 						return fmt.Errorf("减仓缓存中不存在")
-	// 					}
-
-	// 					order, err := orderService.CreateReduceReduceOrder(db, reduceOrderStrategy.OrderId, item2.Price, item2.Num, trade.PriceDigit)
-
-	// 					if err != nil {
-	// 						logger.Errorf("%d 生成订单失败", reduceOrderStrategy.OrderId)
-	// 					}
-
-	// 					reduceOrder.ApiId = order.ApiId
-	// 					reduceOrder.Id = order.Id
-	// 					reduceOrder.Pid = order.Pid
-	// 					reduceOrder.MainId = order.MainId
-	// 					reduceOrder.Symbol = order.Symbol
-	// 					reduceOrder.Side = reduceOrderStrategy.Side
-	// 					reduceOrder.OrderSn = order.OrderSn
-	// 					reduceOrder.Price = item2.Price
-	// 					reduceOrder.Num = item2.Num
-	// 					if SpotReduceTrigger(db, reduceOrder, spotApi, setting, reduceReduceListKey, item, true, reduceOrderStrategy.OrderId) {
-	// 						reduceOrderStrategy.Items[index].Actived = true
-	// 						allActive := true
-	// 						orderId := utility.IntToString(reduceOrderStrategy.OrderId)
-
-	// 						for _, item3 := range reduceOrderStrategy.Items {
-	// 							if !item3.Actived {
-	// 								allActive = false
-	// 								break
-	// 							}
-	// 						}
-
-	// 						if allActive {
-	// 							if err := helper.DefaultRedis.HDelField(reduceReduceListKey, orderId); err != nil {
-	// 								logger.Errorf("删除redis reduceReduceListKey失败 %s", err.Error())
-	// 							}
-	// 						} else {
-	// 							str, _ := sonic.MarshalString(reduceOrderStrategy)
-	// 							if err := helper.DefaultRedis.HSetField(reduceReduceListKey, orderId, str); err != nil {
-	// 								logger.Errorf("更新redis reduceReduceListKey失败 %s", err.Error())
-	// 							}
-	// 						}
-	// 					}
-	// 				}
-	// 			}
-	// 		}
-	// 	}
-	// }
-
-	// //减仓单
-	// reduceVal, _ := helper.DefaultRedis.GetAllList(key)
-
-	// for _, item := range reduceVal {
-	// 	if err := sonic.Unmarshal([]byte(item), &reduceOrder); err != nil {
-	// 		logger.Error("反序列化失败")
-	// 		continue
-	// 	}
-
-	// 	if reduceOrder.Symbol == trade.Coin+trade.Currency {
-	// 		orderPrice := reduceOrder.Price
-	// 		//买入
-	// 		if strings.ToUpper(reduceOrder.Side) == "SELL" &&
-	// 			orderPrice.Cmp(tradePrice) >= 0 &&
-	// 			orderPrice.Cmp(decimal.Zero) > 0 &&
-	// 			tradePrice.Cmp(decimal.Zero) > 0 {
-
-	// 			// SpotReduceTrigger(db, reduceOrder, spotApi, setting, key, item, false, 0)
-	// 		}
-	// 	}
-	// }
-	return nil
-}
-
-// 触发现货减仓
-// isStrategy 是否是策略减仓单
-// reduceId 策略主减仓单id
-func SpotReduceTrigger(db *gorm.DB, reduceOrder positiondto.ReduceListItem, setting DbModels.LineSystemSetting, key, item string, isStrategy bool, reduceId int) bool {
-	// tradeSet, err := cacheservice.GetTradeSet(global.EXCHANGE_BINANCE, reduceOrder.Symbol, 1)
-	result := true
-
-	// if err != nil {
-	// 	logger.Error("获取交易设置失败")
-	// 	return false
-	// }
-	// 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 {
-	// 	logger.Error("获取锁失败", err)
-	// 	return false
-	// } else if ok {
-	// 	defer lock.Release()
-	// 	takeOrders := make([]DbModels.LinePreOrder, 0)
-	// 	if err := db.Model(&DbModels.LinePreOrder{}).Where("main_id =? AND order_type IN (1,2,4) AND status IN (1,5)", reduceOrder.MainId).Find(&takeOrders).Error; err != nil {
-	// 		logger.Error("查询止盈单失败")
-	// 		return false
-	// 	}
-	// 	var hasrecord bool
-
-	// 	if isStrategy {
-	// 		hasrecord, _ = helper.DefaultRedis.HExists(key, utility.IntToString(reduceId), item)
-	// 	} else {
-	// 		hasrecord, _ = helper.DefaultRedis.IsElementInList(key, item)
-	// 	}
-
-	// 	if !hasrecord {
-	// 		logger.Debug("减仓缓存中不存在", item)
-	// 		return false
-	// 	}
-
-	// 	apiInfo, _ := GetApiInfo(reduceOrder.ApiId)
-
-	// 	if apiInfo.Id == 0 {
-	// 		logger.Error("现货减仓 查询api用户不存在")
-	// 		return false
-	// 	}
-
-	// 	for _, takeOrder := range takeOrders {
-	// 		err := CancelOpenOrderByOrderSnLoop(apiInfo, takeOrder.Symbol, takeOrder.OrderSn)
-
-	// 		if err != nil {
-	// 			logger.Error("现货撤单失败", err)
-	// 			return false
-	// 		}
-	// 	}
-	// 	price := reduceOrder.Price.Mul(decimal.NewFromInt(1).Sub(setting.ReducePremium.Div(decimal.NewFromInt(100)))).Truncate(int32(tradeSet.PriceDigit))
-
-	// 	params := OrderPlacementService{
-	// 		ApiId:            reduceOrder.ApiId,
-	// 		Side:             reduceOrder.Side,
-	// 		Type:             "LIMIT",
-	// 		TimeInForce:      "GTC",
-	// 		Symbol:           reduceOrder.Symbol,
-	// 		Price:            price,
-	// 		Quantity:         reduceOrder.Num,
-	// 		NewClientOrderId: reduceOrder.OrderSn,
-	// 	}
-
-	// 	if err := spotApi.OrderPlaceLoop(db, params, 3); err != nil {
-	// 		result = false
-	// 		logger.Errorf("现货减仓挂单失败 id：%s err:%v", reduceOrder.Id, err)
-
-	// 		if err2 := db.Model(&DbModels.LinePreOrder{}).
-	// 			Where("id =? AND status =0", reduceOrder.Id).
-	// 			Updates(map[string]interface{}{"status": 2, "desc": err.Error()}).Error; err2 != nil {
-	// 			logger.Errorf("修改现货减仓状态失败 id：%s err:%v", reduceOrder.Id, err2)
-	// 		}
-	// 	} else {
-	// 		if err := db.Model(&DbModels.LinePreOrder{}).Where("id =?", reduceOrder.Id).Updates(map[string]interface{}{"trigger_time": time.Now()}).Error; err != nil {
-	// 			logger.Error("更新预下单触发事件失败 ordersn:", reduceOrder.OrderSn)
-	// 		}
-
-	// 		if err := db.Model(&DbModels.LinePreOrder{}).
-	// 			Where("id =? AND status =0", reduceOrder.Id).
-	// 			Updates(map[string]interface{}{"status": 1}).Error; err != nil {
-	// 			logger.Errorf("修改现货减仓状态失败 id：%s err:%v", reduceOrder.Id, err)
-	// 		}
-
-	// 		//处理减仓单减仓策略
-	// 		if err := CacheOrderStrategyAndReCreate(db, reduceOrder, 1, tradeSet, setting); err != nil {
-	// 			logger.Errorf("现货减仓 处理减仓策略失败 id:%v err:%v", reduceOrder.Id, err)
-	// 		}
-	// 	}
-
-	// 	if _, err := helper.DefaultRedis.LRem(key, item); err != nil {
-	// 		result = false
-	// 		logger.Errorf("现货减仓 删除缓存失败 id:%v err:%v", reduceOrder.Id, err)
-	// 	}
-	// } else {
-	// 	logger.Error("获取锁失败")
-	// 	result = false
-	// }
-
-	return result
-}
-
-// JudgeTakeOrder 判断是否止盈
-func JudgeTakeOrder(trades []models.TradeSet, symbolType int) error {
-
-	return nil
-}
-
-// JudgeStopOrder 判断是否止损
-func JudgeStopOrder(trades []models.TradeSet, symbolType int) error {
-
-	return nil
-}

services/bitgetservice/bitget_market_client.go

@@ -1,430 +0,0 @@
-package bitgetservice
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"go-admin/services/proxy"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/bytedance/sonic"
-	log "github.com/go-admin-team/go-admin-core/logger"
-	"github.com/gorilla/websocket"
-)
-
-// BitgetMarketClient Bitget公开行情订阅客户端
-// 基于官方SDK设计，专门用于公开市场数据订阅
-type BitgetMarketClient struct {
-	config         *BitgetMarketConfig
-	conn           *websocket.Conn
-	subscriptions  map[SubscribeReq]OnReceive
-	allSubscribes  *Set
-	listener       OnReceive
-	errorListener  OnReceive
-	sendMutex      sync.Mutex
-	reconnectMutex sync.Mutex
-	ctx            context.Context
-	cancel         context.CancelFunc
-	connected      bool
-	lastPongTime   time.Time
-	proxyType      string
-	proxyAddress   string
-	reconnectCount int
-}
-
-// NewBitgetMarketClient 创建新的Bitget市场数据客户端
-func NewBitgetMarketClient(config *BitgetMarketConfig) *BitgetMarketClient {
-	if config == nil {
-		config = DefaultMarketConfig()
-	}
-
-	ctx, cancel := context.WithCancel(context.Background())
-
-	return &BitgetMarketClient{
-		config:        config,
-		subscriptions: make(map[SubscribeReq]OnReceive),
-		allSubscribes: NewSet(),
-		ctx:           ctx,
-		cancel:        cancel,
-		connected:     false,
-		lastPongTime:  time.Now(),
-	}
-}
-
-// SetProxy 设置代理
-func (c *BitgetMarketClient) SetProxy(proxyType, proxyAddress string) {
-	c.proxyType = proxyType
-	c.proxyAddress = proxyAddress
-}
-
-// SetListeners 设置消息监听器
-func (c *BitgetMarketClient) SetListeners(msgListener, errorListener OnReceive) {
-	c.listener = msgListener
-	c.errorListener = errorListener
-}
-
-// Connect 连接WebSocket
-func (c *BitgetMarketClient) Connect() error {
-	c.reconnectMutex.Lock()
-	defer c.reconnectMutex.Unlock()
-
-	if c.connected {
-		return nil
-	}
-
-	// 创建WebSocket连接
-	dialer := websocket.DefaultDialer
-
-	// 设置代理
-	if c.proxyAddress != "" {
-		var err error
-		dialer, err = proxy.GetDialer(c.proxyType, c.proxyAddress)
-		if err != nil {
-			return fmt.Errorf("设置代理失败: %v", err)
-		}
-	}
-
-	dialer.HandshakeTimeout = 10 * time.Second
-	log.Infof("正在连接Bitget市场数据WebSocket: %s", c.config.WsUrl)
-	conn, _, err := dialer.Dial(c.config.WsUrl, nil)
-	if err != nil {
-		return fmt.Errorf("webSocket连接失败: %v", err)
-	}
-
-	c.conn = conn
-	c.connected = true
-	c.lastPongTime = time.Now()
-	c.reconnectCount = 0
-
-	log.Info("Bitget市场数据WebSocket连接成功")
-
-	// 启动消息处理协程
-	go c.readLoop()
-	go c.pingLoop()
-	go c.monitorConnection()
-
-	return nil
-}
-
-// Subscribe 订阅市场数据
-func (c *BitgetMarketClient) Subscribe(subscribeReqs []SubscribeReq, listener OnReceive) error {
-	if !c.connected {
-		if err := c.Connect(); err != nil {
-			return err
-		}
-	}
-
-	var args []interface{}
-	for _, req := range subscribeReqs {
-		// 标准化订阅请求
-		normalizedReq := c.normalizeSubscribeReq(req)
-		args = append(args, normalizedReq)
-
-		// 保存订阅信息
-		c.subscriptions[normalizedReq] = listener
-		c.allSubscribes.Add(normalizedReq)
-	}
-
-	// 发送订阅消息
-	wsReq := WsBaseReq{
-		Op:   "subscribe",
-		Args: args,
-	}
-
-	return c.sendMessage(wsReq)
-}
-
-// Unsubscribe 取消订阅
-func (c *BitgetMarketClient) Unsubscribe(subscribeReqs []SubscribeReq) error {
-	if !c.connected {
-		return errors.New("WebSocket未连接")
-	}
-
-	var args []interface{}
-	for _, req := range subscribeReqs {
-		normalizedReq := c.normalizeSubscribeReq(req)
-		args = append(args, normalizedReq)
-
-		// 移除订阅信息
-		delete(c.subscriptions, normalizedReq)
-		c.allSubscribes.Remove(normalizedReq)
-	}
-
-	// 发送取消订阅消息
-	wsReq := WsBaseReq{
-		Op:   "unsubscribe",
-		Args: args,
-	}
-
-	return c.sendMessage(wsReq)
-}
-
-// normalizeSubscribeReq 标准化订阅请求
-func (c *BitgetMarketClient) normalizeSubscribeReq(req SubscribeReq) SubscribeReq {
-	return SubscribeReq{
-		InstType: strings.ToUpper(req.InstType),
-		Channel:  strings.ToLower(req.Channel),
-		InstId:   strings.ToUpper(req.InstId),
-	}
-}
-
-// sendMessage 发送消息
-func (c *BitgetMarketClient) sendMessage(msg interface{}) error {
-	if c.conn == nil {
-		return errors.New("WebSocket连接不可用")
-	}
-
-	c.sendMutex.Lock()
-	defer c.sendMutex.Unlock()
-
-	data, err := sonic.Marshal(msg)
-	if err != nil {
-		return fmt.Errorf("序列化消息失败: %v", err)
-	}
-
-	log.Info("发送消息: %s", string(data))
-
-	c.conn.SetWriteDeadline(time.Now().Add(c.config.WriteTimeout))
-	return c.conn.WriteMessage(websocket.TextMessage, data)
-}
-
-// readLoop 消息读取循环
-func (c *BitgetMarketClient) readLoop() {
-	defer func() {
-		if r := recover(); r != nil {
-			log.Error("readLoop panic: %v", r)
-		}
-	}()
-
-	for {
-		select {
-		case <-c.ctx.Done():
-			return
-		default:
-			if c.conn == nil {
-				time.Sleep(time.Second)
-				continue
-			}
-
-			c.conn.SetReadDeadline(time.Now().Add(c.config.ReadTimeout))
-			_, message, err := c.conn.ReadMessage()
-			if err != nil {
-				log.Error("读取消息失败: %v", err)
-				c.handleDisconnect()
-				continue
-			}
-
-			c.handleMessage(string(message))
-		}
-	}
-}
-
-// handleMessage 处理接收到的消息
-func (c *BitgetMarketClient) handleMessage(message string) {
-	log.Info("收到消息: %s", message)
-
-	// 处理pong消息
-	if message == "pong" {
-		c.lastPongTime = time.Now()
-		log.Debug("收到pong消息")
-		return
-	}
-
-	// 解析JSON消息
-	var jsonMap map[string]interface{}
-	if err := json.Unmarshal([]byte(message), &jsonMap); err != nil {
-		log.Error("解析JSON消息失败: %v", err)
-		if c.errorListener != nil {
-			c.errorListener(message)
-		}
-		return
-	}
-
-	// 检查错误码
-	if code, exists := jsonMap["code"]; exists {
-		if codeNum, ok := code.(float64); ok && int(codeNum) != 0 {
-			log.Error("收到错误消息: %s", message)
-			if c.errorListener != nil {
-				c.errorListener(message)
-			}
-			return
-		}
-	}
-
-	// 处理订阅确认消息
-	if event, exists := jsonMap["event"]; exists && event == "subscribe" {
-		log.Info("订阅确认: %s", message)
-		return
-	}
-
-	// 处理数据推送
-	if data, exists := jsonMap["data"]; exists && data != nil {
-		if arg, argExists := jsonMap["arg"]; argExists {
-			listener := c.getListener(arg)
-			if listener != nil {
-				listener(message)
-			}
-		}
-		return
-	}
-
-	// 默认处理
-	if c.listener != nil {
-		c.listener(message)
-	}
-}
-
-// getListener 获取对应的监听器
-func (c *BitgetMarketClient) getListener(argJson interface{}) OnReceive {
-	argMap, ok := argJson.(map[string]interface{})
-	if !ok {
-		return c.listener
-	}
-
-	subscribeReq := SubscribeReq{
-		InstType: fmt.Sprintf("%v", argMap["instType"]),
-		Channel:  fmt.Sprintf("%v", argMap["channel"]),
-		InstId:   fmt.Sprintf("%v", argMap["instId"]),
-	}
-
-	if listener, exists := c.subscriptions[subscribeReq]; exists {
-		return listener
-	}
-
-	return c.listener
-}
-
-// pingLoop Ping循环
-func (c *BitgetMarketClient) pingLoop() {
-	ticker := time.NewTicker(c.config.PingInterval)
-	defer ticker.Stop()
-
-	for {
-		select {
-		case <-c.ctx.Done():
-			return
-		case <-ticker.C:
-			if c.connected && c.conn != nil {
-				c.sendMutex.Lock()
-				c.conn.SetWriteDeadline(time.Now().Add(c.config.WriteTimeout))
-				err := c.conn.WriteMessage(websocket.TextMessage, []byte("ping"))
-				c.sendMutex.Unlock()
-
-				if err != nil {
-					log.Error("发送ping失败: %v", err)
-					c.handleDisconnect()
-				}
-			}
-		}
-	}
-}
-
-// monitorConnection 监控连接状态
-func (c *BitgetMarketClient) monitorConnection() {
-	ticker := time.NewTicker(30 * time.Second)
-	defer ticker.Stop()
-
-	for {
-		select {
-		case <-c.ctx.Done():
-			return
-		case <-ticker.C:
-			if c.connected && time.Since(c.lastPongTime) > 60*time.Second {
-				log.Warn("长时间未收到pong消息，触发重连")
-				c.handleDisconnect()
-			}
-		}
-	}
-}
-
-// handleDisconnect 处理断开连接
-func (c *BitgetMarketClient) handleDisconnect() {
-	c.reconnectMutex.Lock()
-	defer c.reconnectMutex.Unlock()
-
-	if !c.connected {
-		return
-	}
-
-	log.Warn("WebSocket连接断开，准备重连")
-	c.connected = false
-
-	if c.conn != nil {
-		c.conn.Close()
-		c.conn = nil
-	}
-
-	// 重连逻辑
-	go c.reconnect()
-}
-
-// reconnect 重连
-func (c *BitgetMarketClient) reconnect() {
-	for c.reconnectCount < c.config.MaxReconnectTimes {
-		select {
-		case <-c.ctx.Done():
-			return
-		default:
-			c.reconnectCount++
-			log.Info("尝试重连 (%d/%d)", c.reconnectCount, c.config.MaxReconnectTimes)
-
-			time.Sleep(c.config.ReconnectInterval)
-
-			if err := c.Connect(); err != nil {
-				log.Error("重连失败: %v", err)
-				continue
-			}
-
-			// 重新订阅
-			if err := c.resubscribe(); err != nil {
-				log.Error("重新订阅失败: %v", err)
-				c.handleDisconnect()
-				continue
-			}
-
-			log.Info("重连成功")
-			return
-		}
-	}
-
-	log.Error("达到最大重连次数，停止重连")
-}
-
-// resubscribe 重新订阅
-func (c *BitgetMarketClient) resubscribe() error {
-	if len(c.subscriptions) == 0 {
-		return nil
-	}
-
-	var args []interface{}
-	for req := range c.subscriptions {
-		args = append(args, req)
-	}
-
-	wsReq := WsBaseReq{
-		Op:   "subscribe",
-		Args: args,
-	}
-
-	return c.sendMessage(wsReq)
-}
-
-// Close 关闭客户端
-func (c *BitgetMarketClient) Close() error {
-	c.cancel()
-	c.connected = false
-
-	if c.conn != nil {
-		return c.conn.Close()
-	}
-
-	return nil
-}
-
-// IsConnected 检查连接状态
-func (c *BitgetMarketClient) IsConnected() bool {
-	return c.connected
-}

services/bitgetservice/bitget_market_future.go

@@ -1,61 +0,0 @@
-package bitgetservice
-
-import (
-	"go-admin/config"
-
-	"github.com/go-admin-team/go-admin-core/logger"
-)
-
-type BitgetMarketFutureClient struct {
-}
-
-func (c *BitgetMarketFutureClient) Subscribe(symbols []string) error {
-	// 1. 创建Bitget客户端（不需要API密钥用于公开数据）
-	client := &BitgetClient{}
-
-	// 初始化公开行情客户端
-	marketConfig := DefaultMarketConfig()
-	client.marketClient = NewBitgetMarketClient(marketConfig)
-	if config.ExtConfig.ProxyUrl != "" {
-		client.SetMarketProxy("", config.ExtConfig.ProxyUrl)
-	}
-
-	// 3. 设置消息监听器
-	msgListener := func(message string) {
-		logger.Info("收到市场数据: %s", message)
-		// 在这里处理市场数据
-	}
-
-	errorListener := func(message string) {
-		logger.Error("收到错误消息: %s", message)
-	}
-
-	client.SetMarketListeners(msgListener, errorListener)
-
-	// 4. 连接WebSocket
-	if err := client.ConnectMarketData(); err != nil {
-		logger.Error("连接市场数据失败: %v", err)
-		return err
-	}
-
-	// 5. 订阅合约行情
-	tickerListener := func(message string) {
-		logger.Info("收到BTC-USDT合约行情: %s", message)
-	}
-
-	params := []SubscribeReq{}
-
-	for _, v := range symbols {
-		params = append(params, SubscribeReq{
-			InstType: "USDT-FUTURES",
-			Channel:  "ticker",
-			InstId:   v,
-		})
-	}
-
-	if err := client.SubscribeMarketData(params, tickerListener); err != nil {
-		logger.Error("订阅合约行情失败: %v", err)
-		return err
-	}
-	return nil
-}

services/bitgetservice/bitget_market_models.go

@@ -1,126 +0,0 @@
-package bitgetservice
-
-import "time"
-
-// SubscribeReq 订阅请求结构（基于官方SDK）
-type SubscribeReq struct {
-	InstType string `json:"instType"` // 产品类型：SPOT-现货，UMCBL-U本位合约，DMCBL-币本位合约
-	Channel  string `json:"channel"`  // 频道名称
-	InstId   string `json:"instId"`   // 产品ID
-	// Coin     string `json:"coin"`     // 币种（可选）
-}
-
-// WsBaseReq WebSocket基础请求结构
-type WsBaseReq struct {
-	Op   string        `json:"op"`   // 操作类型：subscribe, unsubscribe, login
-	Args []interface{} `json:"args"` // 参数列表
-}
-
-// WsLoginReq WebSocket登录请求
-type WsLoginReq struct {
-	ApiKey     string `json:"apiKey"`
-	Passphrase string `json:"passphrase"`
-	Timestamp  string `json:"timestamp"`
-	Sign       string `json:"sign"`
-}
-
-// OnReceive 消息接收回调函数类型
-type OnReceive func(message string)
-
-// Set 集合数据结构（简化实现）
-type Set struct {
-	items map[SubscribeReq]bool
-}
-
-// NewSet 创建新的集合
-func NewSet() *Set {
-	return &Set{
-		items: make(map[SubscribeReq]bool),
-	}
-}
-
-// Add 添加元素到集合
-func (s *Set) Add(item SubscribeReq) {
-	s.items[item] = true
-}
-
-// Remove 从集合中移除元素
-func (s *Set) Remove(item SubscribeReq) {
-	delete(s.items, item)
-}
-
-// Contains 检查集合是否包含元素
-func (s *Set) Contains(item SubscribeReq) bool {
-	_, exists := s.items[item]
-	return exists
-}
-
-// BitgetMarketData 市场数据基础结构
-type BitgetMarketData struct {
-	Action string       `json:"action"` // 推送类型
-	Arg    SubscribeReq `json:"arg"`    // 订阅参数
-	Data   interface{}  `json:"data"`   // 数据内容
-	Ts     int64        `json:"ts"`     // 时间戳
-}
-
-// TickerData 行情数据
-type TickerData struct {
-	InstId    string `json:"instId"`    // 产品ID
-	Last      string `json:"last"`      // 最新价
-	Open24h   string `json:"open24h"`   // 24小时开盘价
-	High24h   string `json:"high24h"`   // 24小时最高价
-	Low24h    string `json:"low24h"`    // 24小时最低价
-	Change24h string `json:"change24h"` // 24小时涨跌幅
-	Vol24h    string `json:"vol24h"`    // 24小时成交量
-	VolCcy24h string `json:"volCcy24h"` // 24小时成交额
-	Ts        string `json:"ts"`        // 时间戳
-}
-
-// DepthData 深度数据
-type DepthData struct {
-	InstId string     `json:"instId"` // 产品ID
-	Asks   [][]string `json:"asks"`   // 卖盘 [价格, 数量]
-	Bids   [][]string `json:"bids"`   // 买盘 [价格, 数量]
-	Ts     string     `json:"ts"`     // 时间戳
-}
-
-// TradeData 成交数据
-type TradeData struct {
-	InstId  string `json:"instId"`  // 产品ID
-	TradeId string `json:"tradeId"` // 成交ID
-	Px      string `json:"px"`      // 成交价格
-	Sz      string `json:"sz"`      // 成交数量
-	Side    string `json:"side"`    // 成交方向 buy/sell
-	Ts      string `json:"ts"`      // 成交时间
-}
-
-// KlineData K线数据
-type KlineData struct {
-	InstId string   `json:"instId"` // 产品ID
-	Candle []string `json:"candle"` // K线数据 [时间戳, 开盘价, 最高价, 最低价, 收盘价, 成交量, 成交额]
-	Ts     string   `json:"ts"`     // 时间戳
-}
-
-// BitgetMarketConfig 市场数据配置
-type BitgetMarketConfig struct {
-	WsUrl             string        // WebSocket地址
-	ReconnectInterval time.Duration // 重连间隔
-	PingInterval      time.Duration // Ping间隔
-	ReadTimeout       time.Duration // 读取超时
-	WriteTimeout      time.Duration // 写入超时
-	MaxReconnectTimes int           // 最大重连次数
-	EnableCompression bool          // 是否启用压缩
-}
-
-// DefaultMarketConfig 默认市场数据配置
-func DefaultMarketConfig() *BitgetMarketConfig {
-	return &BitgetMarketConfig{
-		WsUrl:             "wss://ws.bitget.com/v2/ws/public",
-		ReconnectInterval: 5 * time.Second,
-		PingInterval:      15 * time.Second,
-		ReadTimeout:       60 * time.Second,
-		WriteTimeout:      10 * time.Second,
-		MaxReconnectTimes: 10,
-		EnableCompression: false,
-	}
-}

services/bitgetservice/bitget_market_spot.go

@@ -1,61 +0,0 @@
-package bitgetservice
-
-import (
-	"go-admin/config"
-
-	"github.com/go-admin-team/go-admin-core/logger"
-)
-
-type BitgetMarketSpotClient struct {
-}
-
-func (c *BitgetMarketSpotClient) Subscribe(symbols []string) error {
-	// 1. 创建Bitget客户端（不需要API密钥用于公开数据）
-	client := &BitgetClient{}
-
-	// 初始化公开行情客户端
-	marketConfig := DefaultMarketConfig()
-	client.marketClient = NewBitgetMarketClient(marketConfig)
-	if config.ExtConfig.ProxyUrl != "" {
-		client.SetMarketProxy("", config.ExtConfig.ProxyUrl)
-	}
-
-	// 3. 设置消息监听器
-	msgListener := func(message string) {
-		logger.Infof("收到市场数据: %s", message)
-		// 在这里处理市场数据
-	}
-
-	errorListener := func(message string) {
-		logger.Errorf("收到错误消息: %s", message)
-	}
-
-	client.SetMarketListeners(msgListener, errorListener)
-
-	// 4. 连接WebSocket
-	if err := client.ConnectMarketData(); err != nil {
-		logger.Errorf("连接市场数据失败: %v", err)
-		return err
-	}
-
-	// 5. 订阅现货行情
-	tickerListener := func(message string) {
-		logger.Infof("收到行情: %s", message)
-	}
-
-	params := []SubscribeReq{}
-
-	for _, v := range symbols {
-		params = append(params, SubscribeReq{
-			InstType: "SPOT",
-			Channel:  "ticker",
-			InstId:   v,
-		})
-	}
-
-	if err := client.SubscribeMarketData(params, tickerListener); err != nil {
-		logger.Errorf("订阅现货行情失败: %v", err)
-		return err
-	}
-	return nil
-}

services/bitgetservice/bitget_market_test.go

@@ -1,54 +0,0 @@
-package bitgetservice
-
-import (
-	"go-admin/common/helper"
-	"go-admin/config"
-	"testing"
-	"time"
-
-	"github.com/go-admin-team/go-admin-core/sdk"
-	"gorm.io/driver/mysql"
-	"gorm.io/gorm"
-)
-
-func initSetting() {
-	dsn := "root:123456@tcp(127.0.0.1:3306)/go_exchange_single?charset=utf8mb4&parseTime=True&loc=Local&timeout=1000ms"
-	db, _ := gorm.Open(mysql.Open(dsn), &gorm.Config{})
-	sdk.Runtime.SetDb("default", db)
-	helper.InitDefaultRedis("127.0.0.1:6379", "", 2)
-	helper.InitLockRedisConn("127.0.0.1:6379", "", "2")
-	config.ExtConfig.ProxyUrl = "http://127.0.0.1:7890"
-}
-
-func TestBitgetMarketFutureClient_Subscribe(t *testing.T) {
-	initSetting()
-	// 初始化Bitget合约行情客户端
-	bitgetFut := BitgetMarketFutureClient{}
-
-	// 测试用的合约符号列表
-	testSymbols := []string{"ETHUSDT"}
-
-	// 调用订阅方法
-	err := bitgetFut.Subscribe(testSymbols)
-	if err != nil {
-		t.Errorf("订阅Bitget合约行情失败: %v", err)
-	}
-	time.Sleep(60 * time.Second)
-}
-
-func TestBitgetMarketSpotClient_Subscribe(t *testing.T) {
-	initSetting()
-	// 初始化Bitget现货行情客户端
-	bitgetSpot := BitgetMarketSpotClient{}
-
-	// 测试用的现货符号列表
-	testSymbols := []string{"ETHUSDT"}
-
-	// 调用订阅方法
-	err := bitgetSpot.Subscribe(testSymbols)
-	if err != nil {
-		t.Errorf("订阅Bitget现货行情失败: %v", err)
-	}
-
-	time.Sleep(60 * time.Second)
-}

services/bitgetservice/bitget_rest.go

@@ -1,417 +0,0 @@
-package bitgetservice
-
-import (
-	"fmt"
-	"go-admin/common/global"
-	"go-admin/common/helper"
-	"go-admin/config"
-	"go-admin/models"
-	"go-admin/pkg/utility"
-	"strconv"
-	"strings"
-
-	"github.com/bytedance/sonic"
-	log "github.com/go-admin-team/go-admin-core/logger"
-)
-
-// BitgetRestApi Bitget REST API服务
-type BitgetRestApi struct {
-	httpClient *helper.BitgetClient
-}
-
-// NewBitgetRestApi 创建新的Bitget REST API实例
-func NewBitgetRestApi() *BitgetRestApi {
-	// 从配置中获取代理设置
-	proxyUrl := config.ExtConfig.ProxyUrl
-
-	// 使用代理配置创建HTTP客户端
-	httpClient, err := helper.NewBitgetClient("", "", "", proxyUrl)
-	if err != nil {
-		log.Error("创建Bitget HTTP客户端失败", err)
-		// 如果代理创建失败，使用无代理的客户端
-		httpClient, _ = helper.NewBitgetClient("", "", "", "")
-	}
-
-	return &BitgetRestApi{
-		httpClient: httpClient,
-	}
-}
-
-// NewBitgetSimpleClient 创建简单的Bitget客户端（兼容性函数）
-func NewBitgetSimpleClient() *BitgetClient {
-	// 从配置中获取代理设置
-	proxyUrl := config.ExtConfig.ProxyUrl
-
-	client, err := NewBitgetClient("", "", "", proxyUrl)
-	if err != nil {
-		log.Error("创建Bitget简单客户端失败", err)
-		// 如果代理创建失败，使用无代理的客户端
-		client, _ = NewBitgetClient("", "", "", "")
-	}
-	return client
-}
-
-// bitgetSymbolResponse 通用的符号响应结构体
-type bitgetSymbolResponse struct {
-	Code string `json:"code"`
-	Msg  string `json:"msg"`
-	Data []struct {
-		Symbol            string `json:"symbol"`
-		BaseCoin          string `json:"baseCoin"`
-		QuoteCoin         string `json:"quoteCoin"`
-		Status            string `json:"status"`
-		MinTradeAmount    string `json:"minTradeAmount"`
-		MaxTradeAmount    string `json:"maxTradeAmount"`
-		TakerFeeRate      string `json:"takerFeeRate"`
-		MakerFeeRate      string `json:"makerFeeRate"`
-		PricePrecision    string `json:"pricePrecision"`
-		QuantityPrecision string `json:"quantityPrecision"`
-	} `json:"data"`
-}
-
-// getSymbolsFromAPI 通用的符号获取方法
-// symbolType: "spot" 现货, "futures" 合约
-func (api *BitgetRestApi) getSymbolsFromAPI(symbolType string) ([]BitgetSymbol, error) {
-	var url string
-	var errorPrefix string
-
-	switch symbolType {
-	case "spot":
-		url = "/api/v2/spot/public/symbols"
-		errorPrefix = "现货"
-	case "futures":
-		url = "/api/v2/mix/market/contracts?productType=USDT-FUTURES"
-		errorPrefix = "合约"
-	default:
-		return nil, fmt.Errorf("不支持的符号类型: %s", symbolType)
-	}
-
-	// 发送API请求
-	resp, _, err := api.httpClient.SendSpotRequestAuth(url, "GET", map[string]interface{}{})
-	if err != nil {
-		return nil, fmt.Errorf("获取bitget %s交易所信息失败: %v", errorPrefix, err)
-	}
-
-	// 解析响应数据
-	var response bitgetSymbolResponse
-	if err := sonic.Unmarshal(resp, &response); err != nil {
-		return nil, fmt.Errorf("解析bitget %s交易所信息失败: %v", errorPrefix, err)
-	}
-
-	// 检查API响应状态
-	if response.Code != "00000" {
-		return nil, fmt.Errorf("bitget API错误: %s", response.Msg)
-	}
-
-	// 转换数据格式
-	return api.convertToSymbols(response.Data), nil
-}
-
-// convertToSymbols 将API响应数据转换为BitgetSymbol切片
-func (api *BitgetRestApi) convertToSymbols(data []struct {
-	Symbol            string `json:"symbol"`
-	BaseCoin          string `json:"baseCoin"`
-	QuoteCoin         string `json:"quoteCoin"`
-	Status            string `json:"status"`
-	MinTradeAmount    string `json:"minTradeAmount"`
-	MaxTradeAmount    string `json:"maxTradeAmount"`
-	TakerFeeRate      string `json:"takerFeeRate"`
-	MakerFeeRate      string `json:"makerFeeRate"`
-	PricePrecision    string `json:"pricePrecision"`
-	QuantityPrecision string `json:"quantityPrecision"`
-}) []BitgetSymbol {
-	symbols := make([]BitgetSymbol, 0, len(data))
-	
-	for _, item := range data {
-		if item.Status == "online" {
-			priceDigit, _ := strconv.Atoi(item.PricePrecision)
-			quantileDigit, _ := strconv.Atoi(item.QuantityPrecision)
-
-			symbol := BitgetSymbol{
-				Symbol:        item.Symbol,
-				BaseAsset:     item.BaseCoin,
-				QuoteAsset:    item.QuoteCoin,
-				Status:        item.Status,
-				MinQty:        item.MinTradeAmount,
-				MaxQty:        item.MaxTradeAmount,
-				PriceDigit:    priceDigit,
-				QuantityDigit: quantileDigit,
-			}
-			symbols = append(symbols, symbol)
-		}
-	}
-	
-	return symbols
-}
-
-// GetSpotSymbols 获取现货交易对信息
-func (api *BitgetRestApi) GetSpotSymbols() ([]BitgetSymbol, error) {
-	return api.getSymbolsFromAPI("spot")
-}
-
-// GetFutSymbols 获取合约交易对信息
-func (api *BitgetRestApi) GetFutSymbols() ([]BitgetSymbol, error) {
-	return api.getSymbolsFromAPI("futures")
-}
-
-// symbolConfig 符号配置结构体
-type symbolConfig struct {
-	symbolType        string
-	quoteAssetSymbols []string
-}
-
-// buildTradeSetFromSymbols 通用的TradeSet构建方法
-func buildTradeSetFromSymbols(symbols []BitgetSymbol, config symbolConfig) (map[string]models.TradeSet, []string) {
-	tradeSets := make(map[string]models.TradeSet, len(symbols))
-	deleteSymbols := make([]string, 0)
-
-	for _, item := range symbols {
-		if utility.ContainsStr(config.quoteAssetSymbols, item.QuoteAsset) && item.Status == "online" {
-			tradeSet := models.TradeSet{
-				Coin:        item.BaseAsset,
-				Currency:    item.QuoteAsset,
-				PriceDigit:  item.PriceDigit,
-				AmountDigit: item.QuantityDigit,
-				MinQty:      utility.StringAsFloat(item.MinQty),
-			}
-			tradeSets[item.Symbol] = tradeSet
-		}
-	}
-
-	return tradeSets, deleteSymbols
-}
-
-// GetSpotSymbols 获取现货交易对并构建TradeSet映射
-func GetSpotSymbols() (map[string]models.TradeSet, []string, error) {
-	api := NewBitgetRestApi()
-	symbols, err := api.GetSpotSymbols()
-	if err != nil {
-		log.Error("获取bitget规范信息失败", err)
-		return make(map[string]models.TradeSet, 0), []string{}, err
-	}
-
-	config := symbolConfig{
-		symbolType:        "spot",
-		quoteAssetSymbols: []string{"USDT", "ETH", "BTC", "SOL", "BNB", "DOGE"},
-	}
-
-	tradeSets, deleteSymbols := buildTradeSetFromSymbols(symbols, config)
-	return tradeSets, deleteSymbols, nil
-}
-
-// GetFutSymbols 获取合约交易对并构建TradeSet映射
-func GetFutSymbols() (map[string]models.TradeSet, []string, error) {
-	api := NewBitgetRestApi()
-	symbols, err := api.GetFutSymbols()
-	if err != nil {
-		log.Error("获取bitget合约规范信息失败", err)
-		return make(map[string]models.TradeSet, 0), []string{}, err
-	}
-
-	config := symbolConfig{
-		symbolType:        "futures",
-		quoteAssetSymbols: []string{"USDT"},
-	}
-
-	tradeSets, deleteSymbols := buildTradeSetFromSymbols(symbols, config)
-	return tradeSets, deleteSymbols, nil
-}
-
-// getTicker24hData 获取24小时行情数据的通用方法
-func (api *BitgetRestApi) getTicker24hData(url, tickerType, description string, tradeSet *map[string]models.TradeSet) ([]string, error) {
-	// 定义响应数据结构
-	type tickerResponse struct {
-		Code string `json:"code"`
-		Msg  string `json:"msg"`
-		Data []struct {
-			Symbol    string `json:"symbol"`
-			High24h   string `json:"high24h"`
-			Low24h    string `json:"low24h"`
-			Close     string `json:"lastPr"`
-			Open      string `json:"open"`
-			Volume24h string `json:"baseVolume"`   // 基础币成交量
-			QuoteVol  string `json:"usdtVolume"`   // USDT成交量
-			Change24h string `json:"changeUtc24h"` // UTC 24h涨跌幅
-			Change    string `json:"change24h"`    // 24h涨跌幅
-		} `json:"data"`
-	}
-
-	// 发送API请求
-	resp, _, err := api.httpClient.SendSpotRequestAuth(url, "GET", map[string]interface{}{})
-	if err != nil {
-		return []string{}, fmt.Errorf("获取bitget %s 24h行情失败: %v", description, err)
-	}
-
-	// 解析响应数据
-	var response tickerResponse
-	if err := sonic.Unmarshal(resp, &response); err != nil {
-		return []string{}, fmt.Errorf("解析bitget %s 24h行情失败: %v", description, err)
-	}
-
-	// 检查API响应状态
-	if response.Code != "00000" {
-		return []string{}, fmt.Errorf("bitget %s API错误: %s", description, response.Msg)
-	}
-
-	// 处理行情数据
-	deleteSymbols := make([]string, 0)
-	processedCount := 0
-	errorCount := 0
-
-	for _, item := range response.Data {
-		// 构建缓存键
-		key := fmt.Sprintf(tickerType, global.EXCHANGE_BITGET, item.Symbol)
-
-		// 检查交易对是否存在
-		symbol, exists := (*tradeSet)[item.Symbol]
-		if !exists {
-			// 清理不存在的交易对缓存
-			if err := helper.DefaultRedis.DeleteString(key); err != nil {
-				log.Warn("删除无效缓存失败: %s, error: %v", key, err)
-			}
-			continue
-		}
-
-		// 解析交易对获取coin和currency
-		var coin, currency string
-		if strings.HasSuffix(item.Symbol, symbol.Currency) {
-			coin = strings.TrimSuffix(item.Symbol, symbol.Currency)
-			currency = symbol.Currency
-		} else {
-			deleteSymbols = append(deleteSymbols, item.Symbol)
-			continue
-		}
-
-		// 构建交易对数据
-		symbol.Coin = coin
-		symbol.Currency = currency
-		symbol.OpenPrice = utility.StringAsFloat(item.Open)
-		symbol.PriceChange = utility.StringAsFloat(item.Change)
-		symbol.LowPrice = item.Low24h
-		symbol.HighPrice = item.High24h
-		symbol.Volume = item.Volume24h
-		symbol.QuoteVolume = item.QuoteVol
-		symbol.LastPrice = item.Close
-
-		// 验证数据有效性
-		if symbol.Coin == "" || symbol.Currency == "" ||
-			utility.StringToFloat64(symbol.QuoteVolume) <= 0 ||
-			symbol.LastPrice == "" || utility.StringToFloat64(symbol.LastPrice) <= 0 {
-			if err := helper.DefaultRedis.DeleteString(key); err != nil {
-				log.Warn("删除无效数据缓存失败: %s, error: %v", key, err)
-			}
-			deleteSymbols = append(deleteSymbols, item.Symbol)
-			continue
-		}
-
-		// 缓存数据
-		val, err := sonic.Marshal(symbol)
-		if err != nil {
-			log.Error("序列化交易对数据失败: %s, error: %v", item.Symbol, err)
-			errorCount++
-			continue
-		}
-
-		if err := helper.DefaultRedis.SetString(key, string(val)); err != nil {
-			log.Error("缓存交易对失败: %s, error: %v", item.Symbol, err)
-			errorCount++
-			continue
-		}
-
-		processedCount++
-	}
-
-	log.Info("处理%s行情数据完成: 成功=%d, 错误=%d, 删除=%d",
-		description, processedCount, errorCount, len(deleteSymbols))
-
-	return deleteSymbols, nil
-}
-
-// GetSpotTicker24h 获取现货24小时行情变更并缓存
-func (api *BitgetRestApi) GetSpotTicker24h(tradeSet *map[string]models.TradeSet) ([]string, error) {
-	return api.getTicker24hData("/api/v2/spot/market/tickers", global.TICKER_SPOT, "现货", tradeSet)
-}
-
-// GetFutTicker24h 获取U本位合约24小时行情变更并缓存
-func (api *BitgetRestApi) GetFutTicker24h(tradeSet *map[string]models.TradeSet) ([]string, error) {
-	return api.getTicker24hData("/api/v2/mix/market/tickers?productType=USDT-FUTURES", global.TICKER_FUTURES, "U本位合约", tradeSet)
-}
-
-// BitgetSymbol Bitget交易对信息
-type BitgetSymbol struct {
-	Symbol        string `json:"symbol"`
-	BaseCoin      string `json:"baseCoin"`
-	QuoteCoin     string `json:"quoteCoin"`
-	BaseAsset     string `json:"baseAsset"`
-	QuoteAsset    string `json:"quoteAsset"`
-	Status        string `json:"status"`
-	MinQty        string `json:"minQty"`
-	MaxQty        string `json:"maxQty"`
-	PriceDigit    int    `json:"priceDigit"`
-	QuantityDigit int    `json:"quantityDigit"`
-}
-
-// GetAndReloadSymbols 获取并重新加载交易对信息
-// symbolType 1-现货 2-合约
-func GetAndReloadSymbols(data *map[string]models.TradeSet, symbolType int) error {
-	var tradeSets map[string]models.TradeSet
-	var err error
-
-	switch symbolType {
-	case 1:
-		tradeSets, _, err = GetSpotSymbols()
-	case 2:
-		tradeSets, _, err = GetFutSymbols()
-	default:
-		return fmt.Errorf("无效的symbolType: %d", symbolType)
-	}
-
-	if err != nil {
-		return err
-	}
-
-	*data = tradeSets
-	return nil
-}
-
-// InitSymbolsTicker24h 初始化24小时行情数据
-// symbolType 1-现货 2-合约
-func InitSymbolsTicker24h(data *map[string]models.TradeSet, symbolType int) ([]string, error) {
-	api := NewBitgetRestApi()
-
-	switch symbolType {
-	case 1:
-		return api.GetSpotTicker24h(data)
-	case 2:
-		return api.GetFutTicker24h(data)
-	default:
-		return []string{}, fmt.Errorf("无效的symbolType: %d", symbolType)
-	}
-}
-
-// GetSpotTicker24 获取单个交易对24h行情
-func (api *BitgetRestApi) GetSpotTicker24(symbol string, data *models.Ticker24, tradeSet *models.TradeSet) error {
-	key := fmt.Sprintf(global.TICKER_SPOT, global.EXCHANGE_BITGET, symbol)
-	val, err := helper.DefaultRedis.GetString(key)
-
-	if err != nil {
-		return err
-	}
-
-	err = sonic.Unmarshal([]byte(val), tradeSet)
-	if err != nil {
-		return err
-	}
-
-	if tradeSet.Coin != "" {
-		data.HighPrice = tradeSet.HighPrice
-		data.ChangePercent = fmt.Sprintf("%g", tradeSet.PriceChange)
-		data.LastPrice = tradeSet.LastPrice
-		data.LowPrice = tradeSet.LowPrice
-		data.OpenPrice = fmt.Sprintf("%g", tradeSet.OpenPrice)
-		data.QuoteVolume = tradeSet.QuoteVolume
-		data.Volume = tradeSet.Volume
-	}
-
-	return nil
-}

services/bitgetservice/bitget_rest_test.go

@@ -1,41 +0,0 @@
-package bitgetservice
-
-import (
-	"go-admin/config"
-	"go-admin/test"
-	"testing"
-)
-
-func TestGetSpotSymbols(t *testing.T) {
-	test.InitSettings()
-	api := NewBitgetRestApi()
-
-	symbols, err := api.GetSpotSymbols()
-
-	if err != nil {
-		t.Error(err)
-	}
-
-	t.Log(symbols)
-}
-
-// 获取交易所信息
-func TestGetExchangeInfo(t *testing.T) {
-	test.InitSettings()
-
-	client, err := NewBitgetClient("", "", "", config.ExtConfig.ProxyUrl)
-
-	if err != nil {
-		t.Error(err)
-
-	}
-
-	data, err := client.GetExchangeInfo()
-
-	if err != nil {
-		t.Error(err)
-
-	}
-
-	t.Log(data)
-}

services/bitgetservice/bitget_socketmanager.go

@@ -1,658 +0,0 @@
-package bitgetservice
-
-import (
-	"context"
-	"crypto/hmac"
-	"crypto/sha256"
-	"encoding/base64"
-	"errors"
-	"fmt"
-	"go-admin/pkg/utility"
-	"net"
-	"net/http"
-	"net/url"
-	"os"
-	"os/signal"
-	"strconv"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"github.com/bytedance/sonic"
-	log "github.com/go-admin-team/go-admin-core/logger"
-	"github.com/gorilla/websocket"
-	"golang.org/x/net/proxy"
-)
-
-// BitgetWebSocketManager Bitget WebSocket管理器
-// 类似于BinanceWebSocketManager，支持外部传入API密钥
-type BitgetWebSocketManager struct {
-	ws          *websocket.Conn
-	stopChannel chan struct{}
-	url         string
-	/* 0-现货 1-合约 */
-	wsType       int
-	apiKey       string
-	apiSecret    string
-	passphrase   string
-	proxyType    string
-	proxyAddress string
-	reconnect    chan struct{}
-	isStopped    bool       // 标记 WebSocket 是否已主动停止
-	mu           sync.Mutex // 用于控制并发访问 isStopped
-	cancelFunc   context.CancelFunc
-	reconnecting atomic.Bool // 防止重复重连
-	ConnectTime  time.Time   // 当前连接建立时间
-}
-
-// 已有连接存储
-var BitgetSpotSockets = map[string]*BitgetWebSocketManager{}
-var BitgetFutureSockets = map[string]*BitgetWebSocketManager{}
-
-// NewBitgetWebSocketManager 创建新的Bitget WebSocket管理器
-func NewBitgetWebSocketManager(wsType int, apiKey, apiSecret, passphrase, proxyType, proxyAddress string) *BitgetWebSocketManager {
-	var wsUrl string
-
-	switch wsType {
-	case 0: // 现货
-		wsUrl = "wss://ws.bitget.com/spot/v1/stream"
-	case 1: // 合约
-		wsUrl = "wss://ws.bitget.com/mix/v1/stream"
-	default:
-		wsUrl = "wss://ws.bitget.com/spot/v1/stream"
-	}
-
-	return &BitgetWebSocketManager{
-		stopChannel:  make(chan struct{}, 10),
-		reconnect:    make(chan struct{}, 10),
-		isStopped:    false,
-		url:          wsUrl,
-		wsType:       wsType,
-		apiKey:       apiKey,
-		apiSecret:    apiSecret,
-		passphrase:   passphrase,
-		proxyType:    proxyType,
-		proxyAddress: proxyAddress,
-	}
-}
-
-// GetKey 获取API Key
-func (wm *BitgetWebSocketManager) GetKey() string {
-	return wm.apiKey
-}
-
-// Start 启动WebSocket连接
-func (wm *BitgetWebSocketManager) Start() {
-	utility.SafeGo(wm.run)
-}
-
-// Restart 重启连接
-func (wm *BitgetWebSocketManager) Restart(apiKey, apiSecret, passphrase, proxyType, proxyAddress string) *BitgetWebSocketManager {
-	wm.mu.Lock()
-	defer wm.mu.Unlock()
-
-	wm.apiKey = apiKey
-	wm.apiSecret = apiSecret
-	wm.passphrase = passphrase
-	wm.proxyType = proxyType
-	wm.proxyAddress = proxyAddress
-
-	if wm.isStopped {
-		wm.isStopped = false
-		utility.SafeGo(wm.run)
-	} else {
-		log.Warnf("调用Bitget WebSocket restart")
-		wm.triggerReconnect(true)
-	}
-
-	return wm
-}
-
-// triggerReconnect 触发重连
-func (wm *BitgetWebSocketManager) triggerReconnect(force bool) {
-	if force {
-		wm.reconnecting.Store(false)
-	}
-
-	if wm.reconnecting.CompareAndSwap(false, true) {
-		log.Warnf("准备重连Bitget WebSocket key: %s wsType: %v", wm.apiKey, wm.wsType)
-		select {
-		case wm.reconnect <- struct{}{}:
-		default:
-			log.Debugf("Bitget reconnect 信号已存在，跳过 key:%s", wm.apiKey)
-		}
-	}
-}
-
-// run 主运行循环
-func (wm *BitgetWebSocketManager) run() {
-	ctx, cancel := context.WithCancel(context.Background())
-	wm.cancelFunc = cancel
-
-	utility.SafeGo(wm.handleSignal)
-
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		default:
-			if err := wm.connect(ctx); err != nil {
-				wm.handleConnectionError(err)
-
-				if wm.isErrorCountExceeded() {
-					log.Error("连接Bitget WebSocket时出错次数过多，停止WebSocket管理器: wsType=%v, key=%s", wm.wsType, wm.apiKey)
-					wm.Stop()
-					return
-				}
-
-				time.Sleep(5 * time.Second)
-				continue
-			}
-
-			<-wm.stopChannel
-			log.Info("停止Bitget WebSocket管理器... wsType=%s", getBitgetWsTypeName(wm.wsType))
-			wm.Stop()
-			return
-		}
-	}
-}
-
-// handleConnectionError 处理连接错误
-func (wm *BitgetWebSocketManager) handleConnectionError(err error) {
-	// 这里可以添加错误记录到Redis的逻辑，类似binance的实现
-	log.Error("连接Bitget WebSocket时出错: wsType=%v, key=%v, 错误=%v", wm.wsType, wm.apiKey, err)
-}
-
-// isErrorCountExceeded 检查错误次数是否超过阈值
-func (wm *BitgetWebSocketManager) isErrorCountExceeded() bool {
-	// 简化版本，可以根据需要实现更复杂的错误计数逻辑
-	return false
-}
-
-// handleSignal 处理终止信号
-func (wm *BitgetWebSocketManager) handleSignal() {
-	ch := make(chan os.Signal, 1)
-	signal.Notify(ch, os.Interrupt)
-	<-ch
-	wm.Stop()
-}
-
-// connect 建立WebSocket连接
-func (wm *BitgetWebSocketManager) connect(ctx context.Context) error {
-	dialer, err := wm.getDialer()
-	if err != nil {
-		return err
-	}
-
-	// 对于私有频道，需要进行身份验证
-	headers := wm.getAuthHeaders()
-
-	wm.ws, _, err = dialer.Dial(wm.url, headers)
-	if err != nil {
-		return err
-	}
-
-	// 连接成功，更新连接时间
-	wm.ConnectTime = time.Now()
-	log.Info("已连接到Bitget %s WebSocket key:%s", getBitgetWsTypeName(wm.wsType), wm.apiKey)
-
-	// 设置Ping处理器
-	wm.ws.SetPingHandler(func(appData string) error {
-		log.Info("收到Bitget Ping消息 wstype:%v key:%s data:%s", wm.wsType, wm.apiKey, appData)
-
-		for x := 0; x < 5; x++ {
-			if err := wm.ws.WriteControl(websocket.PongMessage, []byte(appData), time.Now().Add(time.Second*10)); err != nil {
-				log.Error("Bitget回应Pong失败 次数:%d err:%v", x, err)
-				time.Sleep(time.Second * 1)
-				continue
-			}
-			break
-		}
-		return nil
-	})
-
-	// 启动各种处理协程
-	utility.SafeGo(func() { wm.readMessages(ctx) })
-	utility.SafeGo(func() { wm.handleReconnect(ctx) })
-	utility.SafeGo(func() { wm.startPingLoop(ctx) })
-
-	// 发送登录认证消息
-	if err := wm.authenticate(); err != nil {
-		return fmt.Errorf("bitget WebSocket认证失败: %v", err)
-	}
-
-	return nil
-}
-
-// getDialer 获取WebSocket拨号器
-func (wm *BitgetWebSocketManager) getDialer() (*websocket.Dialer, error) {
-	if wm.proxyAddress == "" {
-		return &websocket.Dialer{}, nil
-	}
-
-	if !strings.HasPrefix(wm.proxyAddress, "http://") &&
-		!strings.HasPrefix(wm.proxyAddress, "https://") &&
-		!strings.HasPrefix(wm.proxyAddress, "socks5://") {
-		wm.proxyAddress = wm.proxyType + "://" + wm.proxyAddress
-	}
-
-	proxyURL, err := url.Parse(wm.proxyAddress)
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse proxy URL: %v", err)
-	}
-
-	switch proxyURL.Scheme {
-	case "socks5":
-		return wm.createSocks5Dialer(proxyURL)
-	case "http", "https":
-		return &websocket.Dialer{
-			Proxy: func(req *http.Request) (*url.URL, error) {
-				return proxyURL, nil
-			},
-		}, nil
-	default:
-		return nil, fmt.Errorf("unsupported proxy scheme: %s", proxyURL.Scheme)
-	}
-}
-
-// createSocks5Dialer 创建SOCKS5代理拨号器
-func (wm *BitgetWebSocketManager) createSocks5Dialer(proxyURL *url.URL) (*websocket.Dialer, error) {
-	auth := &proxy.Auth{}
-	if proxyURL.User != nil {
-		auth.User = proxyURL.User.Username()
-		auth.Password, _ = proxyURL.User.Password()
-	}
-
-	socksDialer, err := proxy.SOCKS5("tcp", proxyURL.Host, auth, proxy.Direct)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create SOCKS5 proxy dialer: %v", err)
-	}
-
-	return &websocket.Dialer{
-		NetDialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
-			return socksDialer.Dial(network, addr)
-		},
-	}, nil
-}
-
-// getAuthHeaders 获取认证头信息
-func (wm *BitgetWebSocketManager) getAuthHeaders() http.Header {
-	headers := http.Header{}
-
-	if wm.apiKey != "" {
-		timestamp := strconv.FormatInt(time.Now().Unix(), 10)
-		sign := wm.generateSignature(timestamp)
-
-		headers.Set("ACCESS-KEY", wm.apiKey)
-		headers.Set("ACCESS-SIGN", sign)
-		headers.Set("ACCESS-TIMESTAMP", timestamp)
-		headers.Set("ACCESS-PASSPHRASE", wm.passphrase)
-	}
-
-	return headers
-}
-
-// generateSignature 生成签名
-func (wm *BitgetWebSocketManager) generateSignature(timestamp string) string {
-	message := timestamp + "GET" + "/user/verify"
-
-	h := hmac.New(sha256.New, []byte(wm.apiSecret))
-	h.Write([]byte(message))
-
-	return base64.StdEncoding.EncodeToString(h.Sum(nil))
-}
-
-// authenticate 发送认证消息
-func (wm *BitgetWebSocketManager) authenticate() error {
-	if wm.apiKey == "" {
-		return nil // 公共频道不需要认证
-	}
-
-	timestamp := strconv.FormatInt(time.Now().Unix(), 10)
-	sign := wm.generateSignature(timestamp)
-
-	authMsg := map[string]interface{}{
-		"op": "login",
-		"args": []map[string]string{
-			{
-				"apiKey":     wm.apiKey,
-				"passphrase": wm.passphrase,
-				"timestamp":  timestamp,
-				"sign":       sign,
-			},
-		},
-	}
-
-	msgBytes, err := sonic.Marshal(authMsg)
-	if err != nil {
-		return err
-	}
-
-	return wm.ws.WriteMessage(websocket.TextMessage, msgBytes)
-}
-
-// readMessages 读取消息
-func (wm *BitgetWebSocketManager) readMessages(ctx context.Context) {
-	defer func() {
-		if r := recover(); r != nil {
-			log.Error("Bitget WebSocket消息处理器panic: %v", r)
-		}
-	}()
-
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		default:
-			wm.mu.Lock()
-			if wm.isStopped || wm.ws == nil {
-				wm.mu.Unlock()
-				return
-			}
-
-			_, message, err := wm.ws.ReadMessage()
-			wm.mu.Unlock()
-
-			if err != nil {
-				log.Error("Bitget WebSocket读取消息错误: %v", err)
-				wm.triggerReconnect(false)
-				return
-			}
-
-			// 处理消息
-			wm.handleMessage(message)
-		}
-	}
-}
-
-// handleMessage 处理收到的消息
-func (wm *BitgetWebSocketManager) handleMessage(message []byte) {
-	// 解析消息并处理
-	var baseMsg map[string]interface{}
-	if err := sonic.Unmarshal(message, &baseMsg); err != nil {
-		log.Error("解析Bitget WebSocket消息失败: %v", err)
-		return
-	}
-
-	// 检查是否是认证响应
-	if op, exists := baseMsg["op"]; exists && op == "login" {
-		wm.handleAuthResponse(baseMsg)
-		return
-	}
-
-	// 检查是否是订阅数据
-	if arg, exists := baseMsg["arg"]; exists {
-		wm.handleSubscriptionData(baseMsg, arg)
-		return
-	}
-
-	log.Info("收到Bitget WebSocket消息: %s", string(message))
-}
-
-// handleAuthResponse 处理认证响应
-func (wm *BitgetWebSocketManager) handleAuthResponse(msg map[string]interface{}) {
-	if code, exists := msg["code"]; exists {
-		if code == "0" || code == 0 {
-			log.Info("Bitget WebSocket认证成功 key:%s", wm.apiKey)
-			// 认证成功后可以订阅私有频道
-			wm.subscribePrivateChannels()
-		} else {
-			log.Error("Bitget WebSocket认证失败 key:%s code:%v", wm.apiKey, code)
-		}
-	}
-}
-
-// handleSubscriptionData 处理订阅数据
-func (wm *BitgetWebSocketManager) handleSubscriptionData(msg map[string]interface{}, arg interface{}) {
-	// 根据频道类型处理不同的数据
-	// 这里可以根据具体需求实现不同频道的数据处理逻辑
-	log.Info("收到Bitget订阅数据: %v", arg)
-}
-
-// subscribePrivateChannels 订阅私有频道
-func (wm *BitgetWebSocketManager) subscribePrivateChannels() {
-	// 订阅账户更新
-	wm.subscribeAccount()
-	// 订阅订单更新
-	wm.subscribeOrders()
-	// 订阅持仓更新
-	wm.subscribePositions()
-}
-
-// subscribeAccount 订阅账户更新
-func (wm *BitgetWebSocketManager) subscribeAccount() {
-	var channel string
-	if wm.wsType == 0 {
-		channel = "account"
-	} else {
-		channel = "account"
-	}
-
-	subMsg := map[string]interface{}{
-		"op": "subscribe",
-		"args": []map[string]string{
-			{
-				"instType": wm.getInstType(),
-				"channel":  channel,
-				"instId":   "default",
-			},
-		},
-	}
-
-	wm.sendMessage(subMsg)
-}
-
-// subscribeOrders 订阅订单更新
-func (wm *BitgetWebSocketManager) subscribeOrders() {
-	var channel string
-	if wm.wsType == 0 {
-		channel = "orders"
-	} else {
-		channel = "orders"
-	}
-
-	subMsg := map[string]interface{}{
-		"op": "subscribe",
-		"args": []map[string]string{
-			{
-				"instType": wm.getInstType(),
-				"channel":  channel,
-				"instId":   "default",
-			},
-		},
-	}
-
-	wm.sendMessage(subMsg)
-}
-
-// subscribePositions 订阅持仓更新（仅合约）
-func (wm *BitgetWebSocketManager) subscribePositions() {
-	if wm.wsType != 1 {
-		return // 只有合约才有持仓
-	}
-
-	subMsg := map[string]interface{}{
-		"op": "subscribe",
-		"args": []map[string]string{
-			{
-				"instType": "umcbl",
-				"channel":  "positions",
-				"instId":   "default",
-			},
-		},
-	}
-
-	wm.sendMessage(subMsg)
-}
-
-// getInstType 获取产品类型
-func (wm *BitgetWebSocketManager) getInstType() string {
-	if wm.wsType == 0 {
-		return "sp" // 现货
-	}
-	return "umcbl" // U本位合约
-}
-
-// SendMessage 发送消息（公开方法）
-func (wm *BitgetWebSocketManager) SendMessage(msg interface{}) error {
-	msgBytes, err := sonic.Marshal(msg)
-	if err != nil {
-		return err
-	}
-
-	wm.mu.Lock()
-	defer wm.mu.Unlock()
-
-	if wm.ws == nil {
-		return errors.New("WebSocket连接不可用")
-	}
-
-	return wm.ws.WriteMessage(websocket.TextMessage, msgBytes)
-}
-
-// sendMessage 发送消息（私有方法，保持向后兼容）
-func (wm *BitgetWebSocketManager) sendMessage(msg interface{}) error {
-	return wm.SendMessage(msg)
-}
-
-// handleReconnect 处理重连
-func (wm *BitgetWebSocketManager) handleReconnect(ctx context.Context) {
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		case <-wm.reconnect:
-			wm.reconnecting.Store(false)
-			log.Info("开始重连Bitget WebSocket key:%s", wm.apiKey)
-
-			wm.mu.Lock()
-			if wm.ws != nil {
-				wm.ws.Close()
-				wm.ws = nil
-			}
-			wm.mu.Unlock()
-
-			// 触发主循环重新连接
-			select {
-			case wm.stopChannel <- struct{}{}:
-			default:
-			}
-		}
-	}
-}
-
-// startPingLoop 启动心跳循环
-func (wm *BitgetWebSocketManager) startPingLoop(ctx context.Context) {
-	ticker := time.NewTicker(30 * time.Second)
-	defer ticker.Stop()
-
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		case <-ticker.C:
-			wm.sendPing()
-		}
-	}
-}
-
-// sendPing 发送心跳
-func (wm *BitgetWebSocketManager) sendPing() {
-	pingMsg := "ping"
-
-	wm.mu.Lock()
-	defer wm.mu.Unlock()
-
-	if wm.ws == nil {
-		return
-	}
-
-	if err := wm.ws.WriteMessage(websocket.TextMessage, []byte(pingMsg)); err != nil {
-		log.Error("Bitget WebSocket发送ping失败: %v", err)
-		wm.triggerReconnect(false)
-	}
-}
-
-// Stop 停止WebSocket连接
-func (wm *BitgetWebSocketManager) Stop() {
-	wm.mu.Lock()
-	defer wm.mu.Unlock()
-
-	if wm.isStopped {
-		return
-	}
-
-	wm.isStopped = true
-
-	if wm.cancelFunc != nil {
-		wm.cancelFunc()
-	}
-
-	if wm.ws != nil {
-		wm.ws.Close()
-		wm.ws = nil
-	}
-
-	// 从全局map中移除
-	if wm.wsType == 0 {
-		delete(BitgetSpotSockets, wm.apiKey)
-	} else {
-		delete(BitgetFutureSockets, wm.apiKey)
-	}
-
-	log.Info("Bitget WebSocket已停止 key:%s", wm.apiKey)
-}
-
-// getBitgetWsTypeName 获取WebSocket类型名称
-func getBitgetWsTypeName(wsType int) string {
-	switch wsType {
-	case 0:
-		return "现货"
-	case 1:
-		return "合约"
-	default:
-		return "未知"
-	}
-}
-
-// 工具函数：获取或创建Bitget WebSocket管理器
-func GetOrCreateBitgetWebSocketManager(wsType int, apiKey, apiSecret, passphrase, proxyType, proxyAddress string) *BitgetWebSocketManager {
-	var socketsMap map[string]*BitgetWebSocketManager
-
-	if wsType == 0 {
-		socketsMap = BitgetSpotSockets
-	} else {
-		socketsMap = BitgetFutureSockets
-	}
-
-	if manager, exists := socketsMap[apiKey]; exists {
-		// 如果参数有变化，重启连接
-		if manager.apiSecret != apiSecret || manager.passphrase != passphrase ||
-			manager.proxyType != proxyType || manager.proxyAddress != proxyAddress {
-			manager.Restart(apiKey, apiSecret, passphrase, proxyType, proxyAddress)
-		}
-		return manager
-	}
-
-	// 创建新的管理器
-	manager := NewBitgetWebSocketManager(wsType, apiKey, apiSecret, passphrase, proxyType, proxyAddress)
-	socketsMap[apiKey] = manager
-
-	return manager
-}
-
-// StopBitgetWebSocketManager 停止指定的WebSocket管理器
-func StopBitgetWebSocketManager(wsType int, apiKey string) {
-	var socketsMap map[string]*BitgetWebSocketManager
-
-	if wsType == 0 {
-		socketsMap = BitgetSpotSockets
-	} else {
-		socketsMap = BitgetFutureSockets
-	}
-
-	if manager, exists := socketsMap[apiKey]; exists {
-		manager.Stop()
-	}
-}

services/cacheservice/confg_server_test.go

@@ -0,0 +1,23 @@
+package cacheservice
+
+import (
+	"go-admin/common/helper"
+	"testing"
+
+	"gorm.io/driver/mysql"
+	"gorm.io/gorm"
+)
+
+func TestGetReverseSetting(t *testing.T) {
+	dsn := "root:123456@tcp(127.0.0.1:3306)/go_exchange_single?charset=utf8mb4&parseTime=True&loc=Local&timeout=1000ms"
+	db, _ := gorm.Open(mysql.Open(dsn), &gorm.Config{})
+	helper.InitDefaultRedis("127.0.0.1:6379", "", 2)
+
+	setting, err := GetReverseSetting(db)
+
+	if err != nil {
+		t.Error(err)
+	}
+
+	t.Log(setting)
+}

services/cacheservice/config_service.go

@@ -64,58 +64,33 @@ func GetConfigCacheByKey(db *gorm.DB, key string) models.SysConfig {
 }
 
 // 获取缓存交易对
-// symbolType 1-现货 2-合约
+// symbolType 0-现货 1-合约
 func GetTradeSet(exchangeType string, symbol string, symbolType int) (models2.TradeSet, error) {
+	// 定义返回结果和val变量
 	result := models2.TradeSet{}
 	val := ""
 
+	// 根据交易对类型选择不同的key
 	switch symbolType {
-	case 1:
+	case 0:
 		key := fmt.Sprintf(global.TICKER_SPOT, exchangeType, symbol)
 		val, _ = helper.DefaultRedis.GetString(key)
-	case 2:
+	case 1:
 		key := fmt.Sprintf(global.TICKER_FUTURES, exchangeType, symbol)
 		val, _ = helper.DefaultRedis.GetString(key)
 	}
 
+	// 如果val不为空，则解析val为TradeSet结构体
 	if val != "" {
 		if err := sonic.Unmarshal([]byte(val), &result); err != nil {
 			return result, err
 		}
 	} else {
+		// 如果val为空，则返回错误信息
 		return result, errors.New("未找到交易对信息")
 	}
 
-	return result, nil
-}
-
-// 获取交易所所有交易对
-// symbolType 1-现货 2-合约
-func GetExchangeTradeSets(exchange string, symbolType int) ([]models2.TradeSet, error) {
-	result := []models2.TradeSet{}
-	val := []string{}
-
-	switch symbolType {
-	case 1:
-		key := fmt.Sprintf(global.TICKER_SPOT, exchange, "*")
-		val, _ = helper.DefaultRedis.GetAllKeysAndValues(key)
-	case 2:
-		key := fmt.Sprintf(global.TICKER_FUTURES, exchange, "*")
-		val, _ = helper.DefaultRedis.GetAllKeysAndValues(key)
-	}
-
-	for _, v := range val {
-		item := models2.TradeSet{}
-		if err := sonic.Unmarshal([]byte(v), &item); err != nil {
-			return result, err
-		}
-		result = append(result, item)
-	}
-
-	if len(result) == 0 {
-		return result, errors.New("未找到交易对信息")
-	}
-
+	// 返回结果
 	return result, nil
 }
 
@@ -155,3 +130,22 @@ func ResetSystemSetting(db *gorm.DB) (models.LineSystemSetting, error) {
 	}
 	return models.LineSystemSetting{}, nil
 }
+
+// 获取反单配置
+func GetReverseSetting(db *gorm.DB) (models.LineReverseSetting, error) {
+	setting := models.LineReverseSetting{}
+
+	helper.DefaultRedis.HGetAsObject(rediskey.ReverseSetting, &setting)
+
+	if setting.ReverseOrderType == "" {
+		if err := db.Model(&setting).First(&setting).Error; err != nil {
+			logger.Error("获取反单配置失败", err)
+		}
+
+		if err := helper.DefaultRedis.SetHashWithTags(rediskey.ReverseSetting, &setting); err != nil {
+			logger.Error("redis添加反单配置失败", err)
+		}
+	}
+
+	return setting, nil
+}

services/commonservice/commonservice.go

@@ -1,15 +0,0 @@
-package commonservice
-
-import (
-	"github.com/go-admin-team/go-admin-core/sdk"
-	"gorm.io/gorm"
-)
-
-// 获取数据库连接
-func GetDBConnection() *gorm.DB {
-	dbs := sdk.Runtime.GetDb()
-	for _, db := range dbs {
-		return db
-	}
-	return nil
-}

services/commonservice/judge.go

@@ -1,63 +0,0 @@
-package commonservice
-
-import (
-	"errors"
-	"fmt"
-	"go-admin/common/global"
-	"go-admin/common/helper"
-	"go-admin/models/binancedto"
-	"time"
-
-	"github.com/bytedance/sonic"
-)
-
-// 判断api订阅是否超时
-// wsType 1 现货 2 合约
-func JudgeWebsocketTimeout(apiKey string, wsType int) error {
-	key := fmt.Sprintf(global.USER_SUBSCRIBE, apiKey)
-	cache := binancedto.UserSubscribeState{}
-	// 从redis中获取订阅信息
-	subscribeInfo, err := helper.DefaultRedis.GetString(key)
-	if err != nil {
-		return errors.New("获取订阅信息失败")
-	}
-
-	sonic.Unmarshal([]byte(subscribeInfo), &cache)
-
-	if cache.FuturesLastTime == nil && cache.SpotLastTime == nil {
-		return errors.New("未订阅任何行情")
-	}
-
-	var timeOutInterval time.Duration
-
-	if wsType == 1 {
-		timeOutInterval = time.Minute * 2
-	} else {
-		timeOutInterval = time.Minute * 4
-	}
-
-	switch wsType {
-	case 1:
-		// 现货
-		if cache.SpotLastTime == nil {
-			return errors.New("未订阅现货行情")
-		}
-
-		if time.Since(*cache.SpotLastTime) > timeOutInterval {
-			return errors.New("现货行情订阅超时")
-		}
-	case 2:
-		// 合约
-		if cache.FuturesLastTime == nil {
-			return errors.New("未订阅合约行情")
-		}
-
-		if time.Since(*cache.FuturesLastTime) > timeOutInterval {
-			return errors.New("合约行情订阅超时")
-		}
-	default:
-		return errors.New("无效的wsType")
-	}
-
-	return nil
-}

services/excservice/binancereceive.go

@@ -1,7 +1,6 @@
 package excservice
 
 import (
-	"fmt"
 	"go-admin/models/futuresdto"
 	"go-admin/pkg/utility"
 	"go-admin/services/binanceservice"
@@ -16,43 +15,27 @@ import (
   - @msg 消息内容
   - @listenType 订阅类型 0-现货 1-合约
 */
-// ReceiveListen 处理用户订单订阅
-// 返回:
-//   - reconnect: bool, 是否需要立即重连 (通常用于 listenKey 过期)
-//   - fatal: bool, 是否是致命错误 (例如认证失败)，需要停止整个服务
-//   - err: error, 解析或处理过程中的错误
-func ReceiveListen(msg []byte, listenType int, apiKey string) (reconnect bool, fatal bool, err error) {
+func ReceiveListen(msg []byte, listenType int, apiKey string) (reconnect bool, err error) {
 	var dataMap map[string]interface{}
 	err = sonic.Unmarshal(msg, &dataMap)
+
 	if err != nil {
 		log.Error("接收ws 反序列化失败:", err)
-		return false, false, err
-	}
-
-	// 检查是否是币安的错误消息, e.g. {"code":-2015,"msg":"Invalid API-key, IP, or permissions for action."}
-	if code, ok := dataMap["code"].(float64); ok && code != 0 {
-		errMsg, _ := dataMap["msg"].(string)
-		log.Errorf("收到币安错误码: %d, 消息: %s, API Key: %s", int(code), errMsg, apiKey)
-		// -2015 是无效API Key的错误码，这是一个致命错误，不需要重连
-		if int(code) == -2015 {
-			return false, true, fmt.Errorf("币安认证失败 (code: %d): %s", int(code), errMsg)
-		}
-		// 其他错误码可能也需要特殊处理，但暂时我们只将-2015视为致命错误
-		return false, false, nil
+		return
 	}
 
 	event, exits := dataMap["e"]
+
 	if !exits {
-		// 如果没有 event 字段，但也不是一个错误消息，则可能是一个未知的消息格式
-		log.Warn("收到的消息中不存在event字段: %s", string(msg))
-		return false, false, nil
+		log.Error("不存在event")
+		return
 	}
 
 	switch event {
 	//listenKey过期
 	case "listenKeyExpired":
 		log.Info("listenKey过期", string(msg))
-		return true, false, nil
+		return true, nil
 
 	//订单变更
 	case "ORDER_TRADE_UPDATE":
@@ -69,7 +52,7 @@ func ReceiveListen(msg []byte, listenType int, apiKey string) (reconnect bool, f
 			}
 
 			utility.SafeGo(func() {
-				binanceservice.ChangeSpotOrder(mapData)
+				binanceservice.ChangeSpotOrder(mapData, apiKey)
 			})
 		} else {
 			var data futuresdto.OrderTradeUpdate
@@ -81,7 +64,7 @@ func ReceiveListen(msg []byte, listenType int, apiKey string) (reconnect bool, f
 			}
 
 			utility.SafeGo(func() {
-				binanceservice.ChangeFutureOrder(data.OrderDetails)
+				binanceservice.ChangeFutureOrder(data.OrderDetails, apiKey)
 			})
 		}
 	//订单更新
@@ -89,9 +72,9 @@ func ReceiveListen(msg []byte, listenType int, apiKey string) (reconnect bool, f
 		log.Info("executionReport 推送:", string(msg))
 
 		if listenType == 0 { //现货
-			binanceservice.ChangeSpotOrder(dataMap)
+			binanceservice.ChangeSpotOrder(dataMap, apiKey)
 		} else if listenType == 1 { //合约
-			binanceservice.ChangeFutureOrder(dataMap)
+			binanceservice.ChangeFutureOrder(dataMap, apiKey)
 		} else {
 			log.Error("executionReport 不支持的订阅类型", strconv.Itoa(listenType))
 		}
@@ -118,12 +101,12 @@ func ReceiveListen(msg []byte, listenType int, apiKey string) (reconnect bool, f
 
 	case "eventStreamTerminated":
 		log.Info("账户数据流被终止 type:", getWsTypeName(listenType))
-		return true, false, nil
+		return true, nil
 	default:
 		log.Info("未知事件 内容:", string(msg))
 		log.Info("未知事件", event)
-		return false, false, nil
+		return false, nil
 	}
 
-	return false, false, nil
+	return false, nil
 }