From 1a0fbbab32505e2d95babbe92d3f77f904ab85db Mon Sep 17 00:00:00 2001
From: weigang <mr.shuixiang@aliyun.com>
Date: Sun, 13 Sep 2020 14:18:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=95=B0=E6=8D=AE=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8global=5Forder=5Fid=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Console/Commands/MigrateOrder.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Console/Commands/MigrateOrder.php b/app/Console/Commands/MigrateOrder.php
index ff806c3..7151b18 100644
--- a/app/Console/Commands/MigrateOrder.php
+++ b/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,