修正发货回调流程

backend/internal/service/fulfillment.go

@@ -928,13 +928,46 @@ func (s *FulfillmentService) HandleShipNotify(in ShipNotifyInput) (*ShipNotifyRe
 		msg = "订单已标记为发货中"
 	}
 
-	// 游戏相关字段与推送结果合并写入 ResultData，便于后续查询还原（新模型无独立列）。
-	updates["result_data"] = buildShipNotifyResultData(order.ResultData, in, shippedAt)
-
-	if err := s.db.Model(&model.FulfillmentOrder{}).Where("id = ?", order.ID).Updates(updates).Error; err != nil {
+	resultData := buildShipNotifyResultData(order.ResultData, in, shippedAt)
+	updates["result_data"] = resultData
+	var updated model.FulfillmentOrder
+	if err := s.db.Transaction(func(tx *gorm.DB) error {
+		if err := tx.Model(&model.FulfillmentOrder{}).Where("id = ?", order.ID).Updates(updates).Error; err != nil {
+			return err
+		}
+		jobStatus := model.FulfillmentJobStatusProcessing
+		if nextStatus == model.FulfillmentStatusSucceeded {
+			jobStatus = model.FulfillmentJobStatusSucceeded
+		} else if nextStatus == model.FulfillmentStatusFailed {
+			jobStatus = model.FulfillmentJobStatusFailed
+		}
+		jobUpdates := map[string]interface{}{
+			"status":         jobStatus,
+			"result_payload": resultData,
+			"last_error":     in.FailReason,
+		}
+		if in.ProviderOrderNo != "" {
+			jobUpdates["provider_order_no"] = in.ProviderOrderNo
+		}
+		if err := tx.Model(&model.FulfillmentJob{}).Where("order_id = ?", order.ID).Updates(jobUpdates).Error; err != nil {
+			return err
+		}
+		metadata := shipNotifyAuditMetadata(in, nextStatus, msg)
+		if err := writeAudit(tx, &order.MerchantID, nil, nil, "ship.notify", "fulfillment_order", order.OrderNo, metadata); err != nil {
+			return err
+		}
+		if err := tx.Preload("MerchantProduct.Product").First(&updated, order.ID).Error; err != nil {
+			return err
+		}
+		if s.callbacks != nil {
+			if err := s.callbacks.Enqueue(tx, order.MerchantID, "order.fulfillment.updated", orderCallbackData(&updated)); err != nil {
+				return err
+			}
+		}
+		return nil
+	}); err != nil {
 		return nil, err
 	}
-	_ = s.writeShipNotifyAudit(order, in, nextStatus, msg)
 
 	return &ShipNotifyResult{
 		OrderNo: order.OrderNo,
@@ -945,6 +978,10 @@ func (s *FulfillmentService) HandleShipNotify(in ShipNotifyInput) (*ShipNotifyRe
 
 // writeShipNotifyAudit 将上游推送留痕写入 AuditLog（替代旧的 ShipLog 表）。
 func (s *FulfillmentService) writeShipNotifyAudit(order *model.FulfillmentOrder, in ShipNotifyInput, resultStatus, message string) error {
+	return writeAudit(s.db, &order.MerchantID, nil, nil, "ship.notify", "fulfillment_order", order.OrderNo, shipNotifyAuditMetadata(in, resultStatus, message))
+}
+
+func shipNotifyAuditMetadata(in ShipNotifyInput, resultStatus, message string) map[string]interface{} {
 	metadata := map[string]interface{}{
 		"ship_status":       in.ShipStatus,
 		"provider_order_no": in.ProviderOrderNo,
@@ -953,7 +990,7 @@ func (s *FulfillmentService) writeShipNotifyAudit(order *model.FulfillmentOrder,
 		"message":           message,
 		"payload":           in.RawPayload,
 	}
-	return writeAudit(s.db, &order.MerchantID, nil, nil, "ship.notify", "fulfillment_order", order.OrderNo, metadata)
+	return metadata
 }
 
 // buildShipNotifyResultData 把推送结果与游戏字段合并进 ResultData JSON。