订单问题件 [迁移文件修改]

app/Http/Controllers/TestController.php

@@ -27,6 +27,7 @@ use App\Package;
 use App\Process;
 use App\ProcessDaily;
 use App\ProcessStatistic;
+use App\RejectedBill;
 use App\RejectedBillItem;
 use App\Services\common\BatchUpdateService;
 use App\Services\common\DataHandlerService;
@@ -508,6 +509,19 @@ class TestController extends Controller
 //            ->get();
 //        var_dump('query - end',Carbon::now());
 
+
+        $orderIssues = \App\OrderIssue::query()->get();
+        $logistic_number_returns = [];
+        $rejectedBills = [];
+        foreach ($orderIssues as $orderIssue) {
+           $rejectedBill =  $orderIssue->hasOne(RejectedBill::class, 'id', 'rejected_bill_id')->first();
+            $rejectedBills[] =$rejectedBill;
+            $logistic_number_returns[]  = $rejectedBill->logistic_number_return ?? '';
+//            $orderIssue->update(['logistic_number_return'=>$orderIssue->rejectedBill->logistic_number_return ?? null]);
+        }
+        dd($rejectedBills,$logistic_number_returns);
+
+
 //    $orderTrackingService->根据设置从WMS同步追踪货主的订单($startDate);
 
     }

app/OrderIssue.php

@@ -31,8 +31,8 @@ class OrderIssue extends Model
 
     public function rejectedBill()
     {
-        return $this->hasOne(RejectedBill::class, 'id', 'rejected_bill_id'); // 执行迁移文件之前
-//        return $this->hasOne(RejectedBill::class, 'logistic_number_return', 'logistic_number_return'); // 执行迁移文件之后
+//        return $this->hasOne(RejectedBill::class, 'id', 'rejected_bill_id'); // 执行迁移文件之前
+        return $this->hasOne(RejectedBill::class, 'logistic_number_return', 'logistic_number_return'); // 执行迁移文件之后
     }
 
     public function issueType()

database/migrations/2020_09_20_142656_change_order_issue.php

@@ -1,5 +1,6 @@
 <?php
 
+use App\RejectedBill;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -17,12 +18,13 @@ class ChangeOrderIssue extends Migration
             $table->string('logistic_number_return')->nullable()->index()->after('order_id');
         });
 
-        $orderIssues = \App\OrderIssue::query()
-            ->with('rejectedBill')
-            ->get();
+        $orderIssues = \App\OrderIssue::query()->get();
 
         foreach ($orderIssues as $orderIssue) {
-            $orderIssue->update(['logistic_number_return'=>$orderIssue->rejectedBill->logistic_number_return ?? null]);
+            $rejectedBill = $orderIssue->hasOne(RejectedBill::class, 'id', 'rejected_bill_id')->first();
+            if($rejectedBill ?? false){
+                $orderIssue->update(['logistic_number_return'=>$rejectedBill->logistic_number_return ?? null]);
+            }
         }
 
 //        Schema::table('order_issues',function (Blueprint $table) {
@@ -39,20 +41,21 @@ class ChangeOrderIssue extends Migration
     public function down()
     {
         //
-        Schema::table('order_issues',function (Blueprint $table) {
-            $table->integer('rejected_bill_id')->index()->nullable()->comment('退回单')->after('order_id');
-        });
+//        Schema::table('order_issues',function (Blueprint $table) {
+//            $table->integer('rejected_bill_id')->index()->nullable()->comment('退回单')->after('order_id');
+//        });
 
-        $orderIssues = \App\OrderIssue::query()
-            ->with('rejectedBill')
-            ->get();
+        $orderIssues = \App\OrderIssue::query()->get();
 
         foreach ($orderIssues as $orderIssue) {
-            $orderIssue->update(['rejected_bill_id'=>$orderIssue['rejectedBill']['id'] ?? null]);
+            $rejectedBill =  $orderIssue->hasOne(RejectedBill::class, 'logistic_number_return', 'logistic_number_return')->first();
+            if($rejectedBill ?? false){
+                $orderIssue->update(['rejected_bill_id'=>$rejectedBill->id ?? null]);
+            }
         }
 
-//        Schema::table('order_issues',function (Blueprint $table) {
-//            $table->dropColumn('logistic_number_return');
-//        });
+        Schema::table('order_issues',function (Blueprint $table) {
+            $table->dropColumn('logistic_number_return');
+        });
     }
 }