1、有更新，还没测完，暂时归档

services/orderservice/order_service.go

@@ -3,11 +3,13 @@ package orderservice
 import (
 	"fmt"
 	"go-admin/app/admin/models"
-	"go-admin/app/admin/service/dto"
+	"go-admin/common/const/rediskey"
+	"go-admin/common/helper"
 	"go-admin/pkg/utility"
 	"go-admin/pkg/utility/snowflakehelper"
 	"time"
 
+	"github.com/go-admin-team/go-admin-core/logger"
 	"github.com/go-admin-team/go-admin-core/sdk/service"
 	"github.com/jinzhu/copier"
 	"github.com/shopspring/decimal"
@@ -85,17 +87,24 @@ func (e *OrderService) CreateReduceReduceOrder(db *gorm.DB, pid int, price, num
 }
 
 // 触发主单失败
-func (e *OrderService) ErrorTrigger(preOrder *dto.PreOrderRedisList, errData string) error {
-	// var cacheOrderKey string
+// preOrderId 主单id
+// preOrderItem 触发单缓存内容
+func (e *OrderService) ErrorTrigger(preOrderId, symbolType int, exchangeType, preOrderItem string, errData string) error {
+	var cacheOrderKey string
 
-	// if preOrder.OrderType == 1 {
-	// 	cacheOrderKey = fmt.Sprintf(rediskey.PreSpotOrderList, preOrder.ExchangeType)
-	// } else {
-	// 	cacheOrderKey = fmt.Sprintf(rediskey.PreFutOrderList, preOrder.ExchangeType)
-	// }
+	if symbolType == 1 {
+		cacheOrderKey = fmt.Sprintf(rediskey.PreSpotOrderList, exchangeType)
+	} else {
+		cacheOrderKey = fmt.Sprintf(rediskey.PreFutOrderList, exchangeType)
+	}
+
+	if _, err := helper.DefaultRedis.LRem(cacheOrderKey, preOrderItem); err != nil {
+		logger.Errorf("删除缓存减仓单失败：key:%s item:%s err:%v", cacheOrderKey, preOrderItem, err)
+		return err
+	}
 
 	if err := e.Orm.Model(&models.LinePreOrder{}).
-		Where("id = ? and status =1", preOrder.Id).
+		Where("id = ? and status =0", preOrderId).
 		Updates(map[string]interface{}{
 			"status":       2,
 			"desc":         errData,