From b749304e827fa17cca9fc44cccd2d52c15dcb6e1 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Tue, 11 Nov 2025 10:55:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/Trigger.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/server/game/Trigger.go b/src/server/game/Trigger.go
index 2dfee02a..414e5726 100644
--- a/src/server/game/Trigger.go
+++ b/src/server/game/Trigger.go
@@ -91,15 +91,17 @@ func TriggerShippingOrderOrigin(player *Player, req *msg.ReqShippingOrder) {
 	var err error
 	Order, err := db.GetPlayerChargeData(OrderSn)
 	if err != nil {
+		log.Debug("charge shipping GetPlayerChargeData err:%v", err)
 		return
 	}
 	if Order.PayStatus == MergeConst.ORDER_STATUS_SHIP {
+		log.Debug("charge shipping order already shipped OrderSn:%s", OrderSn)
 		return
 	}
-	if !conf.Server.GoogleVerify {
-		Order.PayStatus = MergeConst.ORDER_STATUS_PAY
-		return
-	}
+	// if !conf.Server.GoogleVerify {
+	// 	Order.PayStatus = MergeConst.ORDER_STATUS_PAY
+	// 	return
+	// }
 	if conf.Server.GameName == "Merge_Pet_online" {
 		GoUtil.SendFeishuOrder(int(player.M_DwUin), OrderData.PayChannelOrderId, OrderData.Price, req.ProduceId, OrderData.PayTime, GoUtil.Now())
 	}