From ab7e327f7b2c93c369d26695fec8aa3811cf35ec Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Tue, 27 Oct 2026 11:19:21 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=AE=A2=E5=8D=95=E4=B8=AD=E5=8F=B0):=20?=
 =?UTF-8?q?=E5=88=B0=E5=BA=97=E8=87=AA=E6=8F=90=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=B8=9A=E5=8A=A1=E7=8A=B6=E6=80=81=E8=AF=AF=E6=98=BE?=
 =?UTF-8?q?=E4=B8=BA=E5=BE=85=E5=8F=91=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 详情装配时将中台表权威 shipping_type 合并进源订单再推导业务状态
- 修复存量自提订单扩展表 delivery_type 为空时自提判断失效，顶部误显「待发货」的问题
- 存量数据已回填扩展表 delivery_type=pickup
---
 backend/app/services/order/OrderCenterServices.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/backend/app/services/order/OrderCenterServices.php b/backend/app/services/order/OrderCenterServices.php
index 36add57c3..5779d3ebd 100644
--- a/backend/app/services/order/OrderCenterServices.php
+++ b/backend/app/services/order/OrderCenterServices.php
@@ -1665,6 +1665,11 @@ class OrderCenterServices extends BaseService implements OrderCenterSyncInterfac
             if ($sourceOrder) {
                 $centerStatus = (string)($detail['status_code'] ?? '');
                 $sourceStatus = $adapter->resolveStatusCode($sourceOrder);
+                // 中台表 shipping_type 为配送方式权威来源；扩展表无该列，
+                // 合并进源订单供业务状态推导使用（如到店自提展示「待核销」而非「待发货」）
+                if (!isset($sourceOrder['shipping_type']) && isset($detail['shipping_type'])) {
+                    $sourceOrder['shipping_type'] = $detail['shipping_type'];
+                }
                 if (!$this->isAuthoritativeCenterStatus($centerStatus) || $sourceStatus === $centerStatus) {
                     $detail['status_code'] = $sourceStatus;
                     $detail['business_status'] = $adapter->resolveBusinessStatus($sourceOrder);