Merge branch 'master' of https://gitee.com/v_cms/zyt

你好
2026-05-14 16:27:49 +08:00
parent 800c6af7f1 7ba9dabdb4
commit 5ce331394d
286 changed files with 979 additions and 346 deletions
@@ -392,7 +392,7 @@ class GancaoCallbackController extends BaseApiController
        $nu           = (string) ($ext['nu'] ?? '');
        $supplier     = (string) ($ext['supplier'] ?? '');

-        if ($nu !== '') {
+        if ($nu !== '' && trim((string) ($order->tracking_number ?? '')) === '') {
            $order->tracking_number = mb_substr($nu, 0, 80);
        }
        if ($shippingName !== '') {