测试方法修改

tests/Services/OrderService/CreateOrFindOrderInfoTest.php

@@ -17,9 +17,7 @@ use App\Owner;
 use App\Services\OrderService;
 use App\Shop;
 use App\Warehouse;
-use Carbon\Carbon;
 use Illuminate\Foundation\Testing\RefreshDatabase;
-use Illuminate\Support\Str;
 use Tests\TestCase;
 
 class CreateOrFindOrderInfoTest extends TestCase
@@ -41,11 +39,14 @@ class CreateOrFindOrderInfoTest extends TestCase
         $basSku2 = factory(OracleBasSKU::class)->make(['customerid' => 'TEST_OW']);
         $basSku3 = factory(OracleBasSKU::class)->make(['customerid' => 'TEST_OW']);
 
+        $this->data['warehouse'] = factory(Warehouse::class)->create(['code'=>'WH_TEST']);
+
         $logistic_BasCustomer = factory(OracleBasCustomer::class)->make(['customer_type'=>'CA','customerid'=>'TEST_CA','descr_c'=>'测试承运商']);
         $owner_basCustomer  = factory(OracleBasCustomer::class)->make(['customer_type'=>'OW','customerid'=>'TEST_OW','descr_c'=>'测试货主']);
+        $code_BasCode  = factory(OracleBasCode::class)->make(['codeid'=>'OW','code'=>'99','descr_c'=>'订单完成']);
 
         $orderType = factory(OracleBasCode::class)->make(['code'=>'sysy', 'codeid'=>'SO_TYP', 'codename_c'=>'测试状态']);
-        $wmsOrderHeader = factory(OracleDOCOrderHeader::class)->make(['customerid'=>'TEST_OW','orderType'=>'sysy','userdefine1'=>'TEST_CA']);
+        $wmsOrderHeader = factory(OracleDOCOrderHeader::class)->make(['customerid'=>'TEST_OW','sostatus'=>99,'orderType'=>'sysy','userdefine1'=>'TEST_CA','warehouseid'=>$this->data['warehouse']['code']]);
 
         $oracleDOCOrderDetail1 = factory(OracleDOCOrderDetail::class)->make(['orderno'=>$wmsOrderHeader->orderno,'customerid'=>'TEST_CA','sku'=>$basSku1->sku]);
         $oracleDOCOrderDetail2 = factory(OracleDOCOrderDetail::class)->make(['orderno'=>$wmsOrderHeader->orderno,'customerid'=>'TEST_CA','sku'=>$basSku2->sku]);
@@ -55,11 +56,13 @@ class CreateOrFindOrderInfoTest extends TestCase
         $OracleActAllocationDetail1 = factory(OracleActAllocationDetails::class)->make(['orderno'=>$wmsOrderHeader->orderno,'customerid'=>'TEST_CA','sku'=>$basSku1->sku]);
         $OracleActAllocationDetail2 = factory(OracleActAllocationDetails::class)->make(['orderno'=>$wmsOrderHeader->orderno,'customerid'=>'TEST_CA','sku'=>$basSku2->sku]);
         $OracleActAllocationDetail3 = factory(OracleActAllocationDetails::class)->make(['orderno'=>$wmsOrderHeader->orderno,'customerid'=>'TEST_CA','sku'=>$basSku3->sku]);
-        $OracleActAllocationDetails = collect($OracleActAllocationDetail1,$OracleActAllocationDetail2,$OracleActAllocationDetail3);
+        $OracleActAllocationDetails = collect([$OracleActAllocationDetail1,$OracleActAllocationDetail2,$OracleActAllocationDetail3]);
 
         $wmsOrderHeader->setRelation('oracleDOCOrderDetails',$oracleDOCOrderDetails);
-        $wmsOrderHeader->setRelation('oracleActAllocationDetail',$OracleActAllocationDetails);
+        $wmsOrderHeader->setRelation('actAllocationDetails',$OracleActAllocationDetails);
+        $wmsOrderHeader->setRelation('orderType',$orderType);
         $wmsOrderHeader->setRelation('orderType',$orderType);
+        $wmsOrderHeader->setRelation('oracleBASCode',$code_BasCode);
 
         $this->data['orderHeader'] = $wmsOrderHeader;
 
@@ -78,22 +81,22 @@ class CreateOrFindOrderInfoTest extends TestCase
     public function createOrFindOrderInfo()
     {
         $this->orderService->createOrFindOrderInfo($this->data['orderHeader']);
-        $order = Order::query()->where('code',$this->data['orderno'])->first();
+        $order = Order::query()->where('code',$this->data['orderHeader']['orderno'])->first();
         $this->assertNotNull($order);
         $this->assertEquals($order->code,$this->data['orderHeader']['orderno']);
         $orderPackages  = OrderPackage::query()->where('order_id',$order['id'])->get();
         $orderPackagesCommodities = OrderPackageCommodities::query()->whereIn('order_package_id',data_get($orderPackages,'*.id'))->get();
-        $this->data['delete']['order_id']  = $order['id'];
-        $this->data['delete']['order_package_id']  = data_get($orderPackages,'*.id');
-        $this->data['delete']['order_package_commodity_id']  = data_get($orderPackagesCommodities,'*.id');
+
+        $this->assertNotEmpty($orderPackages);
+        $this->assertNotEmpty($orderPackagesCommodities);
     }
 
     public function tearDown(): void
     {
         cache()->flush();
+        Commodity::query()->whereIn('id',data_get($this->data['sku'],'*.id'))->delete();
         $order = Order::query()->where('code',$this->data['orderHeader']['orderno'])->first();
         $order->delete();
-        Commodity::query()->whereIn('id',data_get($this->data['sku'],'*.id'))->delete();
         $this->data['logistic']->delete();
         $this->data['owner']->delete();
         $this->data['logistic']->delete();