测试修改

app/Services/OrderService.php

@@ -789,7 +789,7 @@ class OrderService
 
     public function syncOrderByWMSOrderHeaders(&$orderHeaders)
     {
-        if($orderHeaders->isEmpty())return [];
+        if($orderHeaders->isEmpty())return;
         /**
          * @var OwnerService $ownerService
          * @var LogisticService $logisticService

tests/Services/OrderService/CreateOrFindOrderInfoTest.php

@@ -16,8 +16,6 @@ class CreateOrFindOrderInfoTest extends TestCase
      * @var OrderService $orderService
      */
     public $orderService;
-    public $data = [];
-    public $order;
 
     public function setUp(): void
     {
@@ -25,13 +23,21 @@ class CreateOrFindOrderInfoTest extends TestCase
         $this->orderService = app('OrderService');
     }
 
-    public function testCreateOrFindOrderInfo()
+    /**
+     * @test
+     */
+    public function createOrFindOrderInfo()
     {
-        $orderHeader =  OracleDOCOrderHeader::query()->orderByDesc('addTime')->first();
+        $orderHeader = OracleDOCOrderHeader::query()->orderByDesc('addTime')->first();
         $this->orderService->createOrFindOrderInfo($orderHeader);
         $order = Order::query()->where('code',$orderHeader->orderno)->first();
         $this->assertNotNull($order);
         $this->assertEquals($order->code,$orderHeader->orderno);
     }
 
+    public function tearDown(): void
+    {
+        cache()->flush();
+        parent::tearDown(); // TODO: Change the autogenerated stub
+    }
 }

tests/Services/OrderService/CreateOrFindOrderTest.php

@@ -3,6 +3,7 @@
 namespace Tests\Services\OrderService;
 
 use App\Logistic;
+use App\OracleBasCustomer;
 use App\OracleDOCOrderHeader;
 use App\Order;
 use App\Owner;
@@ -30,18 +31,32 @@ class CreateOrFindOrderTest extends TestCase
      */
     public function createOrFindOrder()
     {
-        $orderHeader = OracleDOCOrderHeader::query()->where('sostatus',99)->orderByDesc('addtime')->first();
-        Logistic::query()->firstOrCreate(['code'=>$orderHeader->userdefine1,'name'=>'']);
+        $orderHeader = OracleDOCOrderHeader::query()
+            ->where('sostatus',99)
+            ->whereNotNull('issuepartyname')
+            ->whereNotNull('userdefine1')
+            ->orderByDesc('addtime')
+            ->first();
+        $baseCustomer = OracleBasCustomer::query()
+            ->selectRaw('Customer_Type,CustomerID,Descr_C')
+            ->where('Customer_Type','CA')
+            ->where('CustomerID',$orderHeader->userdefine1)->first();
+        Logistic::query()->firstOrCreate(['code'=>$orderHeader->userdefine1,'name'=>$baseCustomer->descr_c]);
         $owner = Owner::query()->firstOrCreate(['code'=>$orderHeader->customerid,'name'=>'']);
         Shop::query()->firstOrCreate(['name'=>$orderHeader->issuepartyname,'owner_id'=>$owner->id]);
         app('WarehouseService')->firstOrCreate(["code"=>$orderHeader->warehouseid],["code"=>$orderHeader->warehouseid,"name"=>$orderHeader->warehouseid]);
-        if(!$orderHeader){
-            $this->assertNull($orderHeader);
-            return;
-        }
+        $this->assertNotNull($orderHeader);
         $this->orderService->createOrFindOrder($orderHeader);
         $order = Order::query()->where('code',$orderHeader->orderno)->first();
         $this->assertNotNull($order);
         $this->assertEquals($order->code,$orderHeader->orderno);
+        $this->assertEquals((string)$order->created_at,(string)$orderHeader->addtime);
+        $this->assertEquals((string)$order->wms_edittime,(string)$orderHeader->edittime);
+    }
+
+    public function tearDown(): void
+    {
+        cache()->flush();
+        parent::tearDown(); // TODO: Change the autogenerated stub
     }
 }

tests/Services/OrderService/FilterOrderByCacheTeat.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace Tests\Services\OrderService;
-
-use App\Services\OrderService;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Illuminate\Foundation\Testing\WithFaker;
-use Tests\TestCase;
-
-class FilterOrderByCacheTeat extends TestCase
-{
-    /**
-     * @var OrderService $service
-     */
-    private $service;
-    public function setUp(): void
-    {
-        parent::setUp(); // TODO: Change the autogenerated stub
-        $this->service = app('OrderService');
-    }
-
-    /**
-     * @test
-     */
-    public function testFilterOderByCache()
-    {
-
-    }
-}

tests/Services/OrderService/FindOrCreateByClientCodeTest.php

@@ -38,4 +38,9 @@ class FindOrCreateByClientCodeTest extends TestCase
         $this->assertNotNull($order->client_code);
         $this->assertNotNull($order->warehouse_id);
     }
+
+    public function tearDown(): void
+    {
+        parent::tearDown(); // TODO: Change the autogenerated stub
+    }
 }

tests/Services/OrderService/GetCreateOrderModelByWMSOrderHeadersTest.php

@@ -121,4 +121,9 @@ class GetCreateOrderModelByWMSOrderHeadersTest extends TestCase
     {
         return $this->shopService->getByWmsOrders($orderHeaders);
     }
+
+    public function tearDown(): void
+    {
+        parent::tearDown(); // TODO: Change the autogenerated stub
+    }
 }