添加测试用例

database/factories/CommodityBarcodeFactory.php

@@ -0,0 +1,15 @@
+<?php
+
+/** @var Factory $factory */
+
+use App\CommodityBarcode;
+use Faker\Generator as Faker;
+use Illuminate\Database\Eloquent\Factory;
+
+$factory->define(CommodityBarcode::class, function (Faker $faker) {
+    return [
+        'code'=> $faker->title(10).$faker->uuid,
+        'commodity_id'=>$faker->numberBetween(10,150000),
+        'created_at'=> now(),
+    ];
+});

database/factories/OrderIssueFactory.php

@@ -17,7 +17,7 @@ $factory->define(OrderIssue::class, function (Faker $faker) {
         'order_id' =>function(){
             return factory(\App\Order::class)->create()->id;
         },
-        'created_at' => $faker->date('y-m-d'),
+        'created_at' => now(),
         'rejected_bill_id' => 0,
         'rejecting_status' => $rejecting_status[rand(0,count($rejecting_status)-1)],
         'result_explain' => $faker->text(20),

database/factories/RejectedBillFactory.php

@@ -0,0 +1,27 @@
+<?php
+
+/** @var Factory $factory */
+
+use App\RejectedBill;
+use Faker\Generator as Faker;
+use Illuminate\Database\Eloquent\Factory;
+
+$factory->define(RejectedBill::class, function (Faker $faker) {
+    return [
+        'id_owner' => $faker->numberBetween(0),
+        'order_number' =>$faker->title(10),
+        'sender' => $faker->name,
+        'mobile_sender' => $faker->phoneNumber,
+        'logistic_number' => $faker->name,
+        'logistic_number_return' => $faker->name(2).$faker->numberBetween(100000000,999999999),
+        'id_logistic_return' => $faker->numberBetween(),
+//        'is_loaded' => null,
+        'fee_collected' => null,
+        'remark' => null,
+        'id_operator' => null,
+        'is_checked' => false,
+        'is_finished' => null,
+        'checked_numbers' => null,
+        'common_01' => null
+    ];
+});

database/factories/RejectedBillItemFactory.php

@@ -0,0 +1,23 @@
+<?php
+
+/** @var Factory $factory */
+
+use App\RejectedBillItem;
+use Faker\Generator as Faker;
+use Illuminate\Database\Eloquent\Factory;
+
+$factory->define(RejectedBillItem::class, function (Faker $faker) {
+    return [
+        'id_rejected_bill' => $faker->numberBetween(0),
+        'barcode_goods' => $faker->colorName,
+        'name_goods' => $faker->name,
+        'amount' => $faker->numberBetween(0, 10),
+        'id_quality_label' => 1,
+        'batch_number' => null,
+        'validity_at' => null,
+        'made_at' => null,
+//        'is_checked' => null,
+        'remark' => null,
+        'is_loaded' => null
+    ];
+});

resources/views/order/issue/index.blade.php

@@ -411,7 +411,7 @@
                                         @click="removeFocusing($event)" v-on:mouseover="showDelBtn($event)" v-on:mouseleave="hideDelBtn($event)" >
                                         <template v-if="logIndex<2||orderIssue.log_is_show===true">
                                             <td style="min-width: 200px">@{{ log.content }} </td>
-                                            <td class="text-muted" style="min-width: 120px">@{{ log.user ? log.user.mame :'' }}  </td>
+                                            <td class="text-muted" style="min-width: 120px"><span v-if="log.user">@{{ log.user.name }}</span></td>
                                             <td class="text-muted" style="min-width: 170px">@{{ log.created_at }}</td>
                                             @can('订单管理-问题件-处理结果删除')
                                                 <td style="" class="m-0 p-0 border-0">

tests/old/OrderIssueTest.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace Tests\Unit;
+
+use App\Authority;
+use App\Commodity;
+use App\CommodityBarcode;
+use App\MeasuringMachine;
+use App\Order;
+use App\OrderIssue;
+use App\OrderIssueRejectedBill;
+use App\OrderPackage;
+use App\OrderPackageCommodities;
+use App\RejectedBill;
+use App\RejectedBillItem;
+use App\Role;
+use App\User;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use function Matrix\add;
+
+class OrderIssueTest extends TestCase{
+
+
+
+    public function testSyncRejectingStatusComparisonIsEqual()
+    {
+        $orderIssue = factory(OrderIssue::class)->create(['rejecting_status' => '未退回']);
+        $orderPackage = factory(OrderPackage::class)->create(['order_id'=>$orderIssue->order->id]);
+        $commodities = factory(Commodity::class)->times(3)->create();
+        $orderPackageCommodities = collect();
+        $commodities_barcodes = collect();
+        foreach ($commodities as $commodity){
+            $commodities_barcode = factory(CommodityBarcode::class)->create(['commodity_id'=>$commodity->id]);
+            $commodities_barcodes->push($commodities_barcode);
+            $orderPackageCommodity = factory(OrderPackageCommodities::class)->create(['order_package_id'=>$orderPackage->id,'amount'=>1,'commodity_id' =>$commodity->id]);
+            $orderPackageCommodities->push($orderPackageCommodity);
+        }
+        $rejectedBill =  factory(RejectedBill::class)->create(['logistic_number_return' => $orderIssue->logistic_number_return]);
+
+        $rejectedBill_items = collect();
+        foreach ($commodities_barcodes as $commodities_barcode){
+            $item = factory(RejectedBillItem::class)->create(['id_rejected_bill'=>$rejectedBill->id,'barcode_goods' => $commodities_barcode->code,'amount'=>1]);
+            $rejectedBill_items->push($item);
+        }
+        $orderIssueRejectedBill = factory(OrderIssueRejectedBill::class)->create(['order_issue_id'=>$orderIssue->id,'logistic_number_return'=>$rejectedBill->logistic_number_return]);
+        $orderIssue->update(['logistic_number_return' =>$rejectedBill->logistic_number_return ]);
+        $orderIssue= OrderIssue::query()->find($orderIssue->id);
+        $orderIssue->syncRejectingStatus();
+
+        $this->assertEquals($orderIssue->rejecting_status,"完全退回");
+        $orderIssue->order->delete();
+        $orderIssue->forceDelete();
+        $orderPackage->forceDelete();
+        $orderPackageCommodities->map(function($item){
+            $item->delete();
+            return 1;
+        });
+        $rejectedBill->forceDelete();
+        $rejectedBill_items->map(function($item){
+            $item->delete();
+            return 1;
+        });
+        $orderIssueRejectedBill->delete();
+    }
+
+    public function testOrderIssue()
+    {
+        $orderIssue = OrderIssue::query()->find(1);
+
+    }
+}