Merge branch 'phoenix' of ssh://120.24.33.109:11022/hyzjshwo/mp_lanzu_cat into phoenix

app/Console/Commands/MigrateOrder.php

@@ -52,7 +52,7 @@ class MigrateOrder extends Command
                 $dataMain = [
                     'market_id' => $main->market_id ?? 0,
                     'order_num' => $main->order_num ?? '',
-                    'global_order_id' => $main->global_order_id ?? 0,
+                    'global_order_id' => $main->global_order_id ?? time().mt_rand(100000,999999),
                     'user_id' => $main->user_id ?? 0,
                     'pay_type' => $main->pay_type ?? 0,
                     'type' => $main->type ?? 0,
@@ -91,7 +91,7 @@ class MigrateOrder extends Command
                 foreach ($orderChildren as $kChild => $child) {
                     // 子订单
                     $dataChild = [
-                        'order_main_id' => $newMainId ?? 0,
+                        'order_main_id' => $dataMain['global_order_id'] ?? 0,
                         'user_id' => $child->user_id ?? 0,
                         'store_id' => $child->store_id ?? 0,
                         'status' => 1,