From 8e5b4f013c8155d1c2d4e221c70c212614d26262 Mon Sep 17 00:00:00 2001
From: hucan <951870319@qq.com>
Date: Wed, 12 Mar 2025 16:56:37 +0800
Subject: [PATCH] 1

---
 app/admin/service/dto/line_pre_order.go | 4 ++--
 app/admin/service/line_pre_order.go     | 2 +-
 services/binanceservice/futuresrest.go  | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/admin/service/dto/line_pre_order.go b/app/admin/service/dto/line_pre_order.go
index aca435f..f8b9f7a 100644
--- a/app/admin/service/dto/line_pre_order.go
+++ b/app/admin/service/dto/line_pre_order.go
@@ -320,7 +320,7 @@ func (req LineAddPreOrderReq) Valid() error {
 		if v.AddType == 1 && v.TakeProfitNumRatio.Cmp(decimal.NewFromInt(100)) < 0 &&
 			v.TakeProfitNumRatio.Cmp(decimal.Zero) > 0 &&
 			(v.TpTpPriceRatio.IsZero() || v.TpTpPriceRatio.Cmp(decimal.NewFromInt(100)) > 0) {
-			return errors.New("止盈后止盈价格不正确")
+			return errors.New("第二止盈价格不正确")
 		}
 	}
 
@@ -461,7 +461,7 @@ func (req LineBatchAddPreOrderReq) CheckParams() error {
 		if v.AddType == 1 && v.TakeProfitNumRatio.Cmp(decimal.NewFromInt(100)) < 0 &&
 			v.TakeProfitNumRatio.Cmp(decimal.Zero) > 0 &&
 			(v.TpTpPriceRatio.IsZero() || v.TpTpPriceRatio.Cmp(decimal.NewFromInt(100)) > 0) {
-			return errors.New("止盈后止盈价格不正确")
+			return errors.New("第二止盈价格不正确")
 		}
 
 		// if v.TpSlPriceRatio.Cmp(decimal.Zero) <= 0 || v.TpSlPriceRatio.Cmp(decimal.NewFromInt(100)) > 0 {
diff --git a/app/admin/service/line_pre_order.go b/app/admin/service/line_pre_order.go
index e042451..25d2d7c 100644
--- a/app/admin/service/line_pre_order.go
+++ b/app/admin/service/line_pre_order.go
@@ -1120,7 +1120,7 @@ func (e *LinePreOrder) AddBatchPreOrder(batchReq *dto.LineBatchAddPreOrderReq, p
 					req.Price = batchReq.Price
 					req.Profit = batchReq.Profit
 					req.ProfitNumRatio = batchReq.ProfitNumRatio
-					req.ProfitTpTpPriceRatio = batchReq.ProfitTpSlPriceRatio
+					req.ProfitTpTpPriceRatio = batchReq.ProfitTpTpPriceRatio
 					req.ProfitTpSlPriceRatio = batchReq.ProfitTpSlPriceRatio
 					req.Ext = batchReq.Ext
 					req.SymbolType = batchReq.SymbolType
diff --git a/services/binanceservice/futuresrest.go b/services/binanceservice/futuresrest.go
index c688c5a..8ca6967 100644
--- a/services/binanceservice/futuresrest.go
+++ b/services/binanceservice/futuresrest.go
@@ -497,12 +497,10 @@ func handleFutMainOrderFilled(db *gorm.DB, preOrder *models.LinePreOrder, extOrd
 	orderExt := models.LinePreOrderExt{}
 	db.Model(&orderExt).Where("order_id =?", extOrderId).First(&orderExt)
 	totalNum := getFuturesPositionAvailableQuantity(db, apiInfo, preOrder, tradeSet).Truncate(int32(tradeSet.AmountDigit))
+	price := utility.StrToDecimal(preOrder.Price).Truncate(int32(tradeSet.PriceDigit))
 
 	// 更新订单数量并处理止盈、止损、减仓
 	for _, order := range orders {
-		price := utility.StrToDecimal(order.Price).Truncate(int32(tradeSet.PriceDigit))
-		order.Price = price.String()
-
 		// 更新止盈止损订单数量
 		num := updateOrderQuantity(db, order, preOrder, &orderExt, totalNum, first, tradeSet)