更新

2026-05-20 15:40:01 +08:00
parent abf8026d45
commit 3e4039efb0
21 changed files with 2507 additions and 532 deletions
@@ -59,7 +59,10 @@ class ExpressTrackingService

        $tracking->order_id = (int) ($params['order_id'] ?? 0);
        $tracking->order_type = (string) ($params['order_type'] ?? 'prescription');
-        $tracking->express_company = (string) ($params['express_company'] ?? 'auto');
+        $tracking->express_company = ExpressTrackService::normalizeExpressCompanyCode(
+            $trackingNumber,
+            (string) ($params['express_company'] ?? 'auto')
+        );
        $tracking->recipient_phone = (string) ($params['recipient_phone'] ?? '');
        $tracking->recipient_name = (string) ($params['recipient_name'] ?? '');
        $tracking->recipient_address = (string) ($params['recipient_address'] ?? '');
@@ -78,6 +81,177 @@ class ExpressTrackingService
        return $tracking;
    }

+    /**
+     * 按快递单号走快递100 查询并落库（CLI：gancao:sync-logistics -t）
+     *
+     * @return array{total:int, success:int, failed:int, skipped:int, assistant_cleared:int, assistant_lines:list<string>, details:array<int, array<string,mixed>>}
+     */
+    public static function queryKuaidiByTrackingNumber(string $trackingNumber): array
+    {
+        $stats = [
+            'total' => 0,
+            'success' => 0,
+            'failed' => 0,
+            'skipped' => 0,
+            'assistant_cleared' => 0,
+            'assistant_skipped_assign_log' => 0,
+            'assistant_lines' => [],
+            'details' => [],
+        ];
+
+        $tn = trim($trackingNumber);
+        if ($tn === '') {
+            $stats['failed'] = 1;
+            $stats['details'][] = [
+                'success' => false,
+                'tracking_number' => '',
+                'message' => '快递单号不能为空',
+            ];
+
+            return $stats;
+        }
+
+        $tracking = self::resolveTrackingByNumber($tn);
+        if (!$tracking) {
+            $stats['failed'] = 1;
+            $stats['details'][] = [
+                'success' => false,
+                'tracking_number' => $tn,
+                'message' => '未找到该快递单号对应的业务订单或物流追踪记录',
+            ];
+
+            return $stats;
+        }
+
+        $stats['total'] = 1;
+        self::backfillRecipientPhoneFromPrescriptionOrder($tracking);
+        self::syncTrackingExpressCompanyFromNumber($tracking);
+
+        try {
+            $result = self::queryAndUpdate((int) $tracking->id, false);
+            $ok = self::isKuaidiQuerySuccessful($result);
+            $detail = [
+                'order_id' => (int) $tracking->order_id,
+                'tracking_number' => (string) $tracking->tracking_number,
+                'success' => $ok,
+                'message' => trim((string) ($result['hint'] ?? '')) ?: 'ok',
+                'traces' => count($result['traces'] ?? []),
+                'state' => (string) ($result['state_text'] ?? $tracking->current_state_text ?? ''),
+                'source' => (string) ($result['source'] ?? ''),
+            ];
+            if ($ok) {
+                $stats['success'] = 1;
+            } else {
+                $stats['failed'] = 1;
+            }
+            $stats['details'][] = $detail;
+        } catch (\Throwable $e) {
+            $stats['failed'] = 1;
+            $stats['details'][] = [
+                'order_id' => (int) $tracking->order_id,
+                'tracking_number' => (string) $tracking->tracking_number,
+                'success' => false,
+                'message' => '异常：' . $e->getMessage(),
+            ];
+            Log::error('queryKuaidiByTrackingNumber failed', [
+                'tracking_number' => $tn,
+                'error' => $e->getMessage(),
+            ]);
+        }
+
+        return $stats;
+    }
+
+    /**
+     * 确保 express_tracking 存在（不发起查询）
+     */
+    private static function resolveTrackingByNumber(string $trackingNumber): ?ExpressTracking
+    {
+        $tn = trim($trackingNumber);
+        if ($tn === '') {
+            return null;
+        }
+
+        $tracking = ExpressTracking::whereRaw('TRIM(`tracking_number`) = ?', [$tn])
+            ->whereNull('delete_time')
+            ->find();
+
+        $order = PrescriptionOrder::whereNull('delete_time')
+            ->whereRaw('TRIM(`tracking_number`) = ?', [$tn])
+            ->order('id', 'desc')
+            ->find();
+
+        if ($tracking && $order) {
+            $dirty = false;
+            if ((int) $tracking->order_id !== (int) $order->id) {
+                $tracking->order_id = (int) $order->id;
+                $dirty = true;
+            }
+            if (trim((string) ($tracking->recipient_phone ?? '')) === '') {
+                $tracking->recipient_phone = (string) ($order->recipient_phone ?? '');
+                $dirty = true;
+            }
+            if ($dirty) {
+                $tracking->update_time = time();
+                $tracking->save();
+            }
+
+            return $tracking;
+        }
+
+        if ($tracking) {
+            self::backfillRecipientPhoneFromPrescriptionOrder($tracking);
+
+            return $tracking;
+        }
+
+        if (!$order) {
+            return null;
+        }
+
+        $now = time();
+        $tracking = new ExpressTracking();
+        $tracking->tracking_number = mb_substr($tn, 0, 80);
+        $tracking->create_time = $now;
+        $tracking->order_id = (int) $order->id;
+        $tracking->order_type = 'prescription';
+        $tracking->express_company = ExpressTrackService::normalizeExpressCompanyCode(
+            $tn,
+            (string) ($order->express_company ?? 'auto')
+        );
+        $tracking->recipient_phone = (string) ($order->recipient_phone ?? '');
+        $tracking->recipient_name = (string) ($order->recipient_name ?? '');
+        $tracking->recipient_address = (string) ($order->shipping_address ?? '');
+        $tracking->next_update_time = $now;
+        $tracking->update_time = $now;
+        $tracking->save();
+
+        return $tracking;
+    }
+
+    /**
+     * @param array<string, mixed>|null $result
+     */
+    private static function isKuaidiQuerySuccessful(?array $result): bool
+    {
+        if (!is_array($result)) {
+            return false;
+        }
+        $source = (string) ($result['source'] ?? '');
+        if ($source !== 'kuaidi100') {
+            return false;
+        }
+        $hint = trim((string) ($result['hint'] ?? ''));
+        if ($hint === '') {
+            return true;
+        }
+        if (str_contains($hint, '暂无轨迹')) {
+            return true;
+        }
+
+        return false;
+    }
+
    /**
     * 查询并更新物流信息
     *
@@ -96,13 +270,14 @@ class ExpressTrackingService
        }

        self::backfillRecipientPhoneFromPrescriptionOrder($tracking);
+        self::syncTrackingExpressCompanyFromNumber($tracking);

        $startTime = microtime(true);

        // 调用快递100查询（顺丰等单号需带收件人手机号后四位，见 ExpressTrackService）
        $result = ExpressTrackService::query(
-            $tracking->express_company,
-            $tracking->tracking_number,
+            (string) $tracking->express_company,
+            (string) $tracking->tracking_number,
            (string) $tracking->recipient_phone
        );

@@ -547,6 +722,27 @@ class ExpressTrackingService
        }
    }

+    /**
+     * 运单号与 express_company 不一致时按单号纠正（如京东单误存 sf）
+     */
+    private static function syncTrackingExpressCompanyFromNumber(ExpressTracking $tracking): void
+    {
+        $num = trim((string) $tracking->tracking_number);
+        if ($num === '') {
+            return;
+        }
+        $normalized = ExpressTrackService::normalizeExpressCompanyCode(
+            $num,
+            (string) ($tracking->express_company ?? 'auto')
+        );
+        if ($normalized === (string) $tracking->express_company) {
+            return;
+        }
+        $tracking->express_company = $normalized;
+        $tracking->update_time = time();
+        $tracking->save();
+    }
+
    /**
     * 保存轨迹明细
     */