From 3992d23f462eb7809fcc9388dec2f6785a32bef9 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Fri, 10 Oct 2025 11:29:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=89=93=E7=82=B9=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/PlayerFunc.go | 13 +++++++------
 src/server/game/Trigger.go    |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/server/game/PlayerFunc.go b/src/server/game/PlayerFunc.go
index 1f1f076d..c6e95e59 100644
--- a/src/server/game/PlayerFunc.go
+++ b/src/server/game/PlayerFunc.go
@@ -1022,14 +1022,9 @@ func (player *Player) TriggerOrder(lv int, Type string, Emit []int, EnergyMul in
 		if v.Preview != "" && !exists && !GoUtil.InArray(v.Id, OrderMod.FinishOrder) {
 			if OrderMod.CheckCondition(lv, v.Preview, Type, Emit, FixedOrder, OrderList) {
 				OrderMod.AddFixOrder(v.Id, v.MergeList, order.Preview_type, v.Items)
-				player.TeLog("preset_order_birth", map[string]interface{}{
-					"order_id":           v.Id,
-					"order_item_id":      v.MergeList,
-					"preset_order_group": v.Group,
-					"preset_order_step":  v.Step,
-				})
 			}
 		}
+
 		if v.Appear != "" {
 			if OrderMod.CheckCondition(lv, v.Appear, Type, Emit, FixedOrder, OrderList) {
 				Type := order.Fixed_type
@@ -1037,6 +1032,12 @@ func (player *Player) TriggerOrder(lv int, Type string, Emit []int, EnergyMul in
 				if OrderType != 0 {
 					Type = OrderType
 				}
+				player.TeLog("preset_order_birth", map[string]interface{}{
+					"order_id":           v.Id,
+					"order_item_id":      v.MergeList,
+					"preset_order_group": v.Group,
+					"preset_order_step":  v.Step,
+				})
 				if exists {
 					orderInfo.Type = order.Fixed_type
 					OrderMod.OrderList[v.Id] = orderInfo
diff --git a/src/server/game/Trigger.go b/src/server/game/Trigger.go
index 30e71db5..f6638f9c 100644
--- a/src/server/game/Trigger.go
+++ b/src/server/game/Trigger.go
@@ -111,7 +111,7 @@ func TriggerShippingOrder(player *Player, req *msg.ReqShippingOrder) {
 		}
 	}
 	if OrderData == nil {
-		GoUtil.SendFeishuFatal(int(player.M_DwUin), "GoogleVerify支付校验异常", fmt.Sprintf("GoogleVerify parmas OrderSn：%s; ProduceId:%s; Token:%s", OrderSn, req.ProduceId, req.Token))
+		GoUtil.SendFeishuFatal(int(player.M_DwUin), "GoogleVerify支付校验异常", fmt.Sprintf("GoogleVerify parmas OrderSn：%s; ProduceId:%s; Token:%s; err: %v", OrderSn, req.ProduceId, req.Token, err))
 		log.Debug("[order data nil] Uid:%d;OrderSn:%s;PayOrder:%s;", player.M_DwUin, OrderSn, req.ProduceId)
 		return
 	} else {