修改商品同步测试文件

app/Services/CommodityService.php

@@ -523,6 +523,7 @@ Class CommodityService
             ];
             return $unexists[json_encode($arr)] ?? false;
         });
+
         $inner_params = (function () use ($BasSKUs, $owner_map) {
             $map = [];
             $BasSKUs->each(function ($basSku) use (&$map, $owner_map) {

tests/Services/CommodityService/GetParamsByBasSkusTest.php

@@ -19,12 +19,13 @@ class GetParamsByBasSkusTest extends TestCase
     {
         parent::setUp(); // TODO: Change the autogenerated stub
         cache()->flush();
+        $this->service=app(CommodityService::class);
         $owner =  factory(Owner::class)->create();
-        $basSKU = factory(OracleBasSKU::class)->make(['customerid'=>$owner->code]);
+        $basSKU = factory(OracleBasSKU::class)->make(['customerid'=>$owner->code,'packid'=>'STANDARD']);
         $this->data['owner'] = $owner;
         $this->data['basSKU'] = $basSKU;
-        $this->bas_skus=collect($this->data['basSKU']);
-        $this->service=app(CommodityService::class);
+        $this->bas_skus=collect();
+        $this->bas_skus->add($basSKU);
 
     }
     public function testGetParamsByBasSkus(){
@@ -32,6 +33,9 @@ class GetParamsByBasSkusTest extends TestCase
             $insert_params=$this->service->getParamsByBasSkus($this->bas_skus);
             if ($insert_params){
                 $this->assertNotNull($insert_params);
+                $this->assertEquals($insert_params[0]['owner_id'],$this->data['owner']['id']);
+                $this->assertEquals($insert_params[0]['sku'],$this->data['basSKU']['sku']);
+                $this->assertEquals($insert_params[0]['name'],$this->data['basSKU']['descr_c']);
             }else{
                 $this->assertNull($insert_params);
             }

tests/Services/CommodityService/SyncCreateCommodityByBasSkusTest.php

@@ -4,6 +4,7 @@ namespace Tests\Services\CommodityService;
 
 use App\Commodity;
 use App\OracleBasSKU;
+use App\Owner;
 use App\Services\CommodityService;
 use App\Services\OwnerService;
 use App\ValueStore;
@@ -21,10 +22,18 @@ class SyncCreateCommodityByBasSkusTest extends TestCase
     public $created_at;
     public $last_time;
     public $insert_params;
+    private $data=[];
     public function setUp(): void
     {
         parent::setUp();
+        cache()->flush();
         $this->service=app(CommodityService::class);
+        $owner =  factory(Owner::class)->create();
+        $basSKU = factory(OracleBasSKU::class)->make(['customerid'=>$owner->code,'packid'=>'STANDARD']);
+        $this->data['owner'] = $owner;
+        $this->data['basSKU'] = $basSKU;
+        $this->bas_skus=collect();
+        $this->bas_skus->add($basSKU);
     }
 
     /**
@@ -32,14 +41,14 @@ class SyncCreateCommodityByBasSkusTest extends TestCase
      */
     public function testSyncCreateCommodityByBasSkus()
     {
-        $this->created_at = config('sync.commodity_sync.created_at');
-        $this->last_time = ValueStore::query()->where('name',$this->created_at)->value('value');
-        if (!$this->last_time) $time=Carbon::now()->subSeconds(65);
-        $this->bas_skus=OracleBasSKU::query()
-            ->select('customerid','sku','descr_c','alternate_sku1','alternate_sku2','alternate_sku3','skulength','skuwidth','skuhigh','cube','packid','addtime','edittime')
-            ->where('addTime', '>=', $this->last_time??$time)
-            ->orderByDesc('addtime')
-            ->get();
+//        $this->created_at = config('sync.commodity_sync.created_at');
+//        $this->last_time = ValueStore::query()->where('name',$this->created_at)->value('value');
+//        if (!$this->last_time) $time=Carbon::now()->subSeconds(65);
+//        $this->bas_skus=OracleBasSKU::query()
+//            ->select('customerid','sku','descr_c','alternate_sku1','alternate_sku2','alternate_sku3','skulength','skuwidth','skuhigh','cube','packid','addtime','edittime')
+//            ->where('addTime', '>=', $this->last_time??$time)
+//            ->orderByDesc('addtime')
+//            ->get();
         $this->insert_params=$this->service->getParamsByBasSkus($this->bas_skus);
         $this->service->syncCreateCommodity($this->bas_skus);
         if ($this->insert_params) $this->assertNotNull($this->insert_params);
@@ -49,12 +58,13 @@ class SyncCreateCommodityByBasSkusTest extends TestCase
 
     public function tearDown(): void
     {
-        ValueStore::query()->updateOrCreate([
-            'name' => $this->created_at,
-        ], [
-            'name' => $this->created_at,
-            'value' => $this->last_time,
-        ]);
+//        ValueStore::query()->updateOrCreate([
+//            'name' => $this->created_at,
+//        ], [
+//            'name' => $this->created_at,
+//            'value' => $this->last_time,
+//        ]);
+        $this->data['owner']->delete();
         $sku=[];
         $owner_id=[];
         if (!$this->insert_params) return;

tests/Services/CommodityService/SyncUpdateCommodityBasSkusTest.php

@@ -4,6 +4,7 @@ namespace Tests\Services\CommodityService;
 
 use App\Commodity;
 use App\OracleBasSKU;
+use App\Owner;
 use App\Services\CommodityService;
 use App\Services\common\DataHandlerService;
 use App\Services\OwnerService;
@@ -22,10 +23,18 @@ class SyncUpdateCommodityBasSkusTest extends TestCase
     public $updated_at;
     public $last_time;
     public $commodities;
+    private $data=[];
     public function setUp(): void
     {
         parent::setUp();
+        cache()->flush();
         $this->service=app(CommodityService::class);
+        $owner =  factory(Owner::class)->create();
+        $basSKU = factory(OracleBasSKU::class)->make(['customerid'=>$owner->code,'packid'=>'STANDARD']);
+        $this->data['owner'] = $owner;
+        $this->data['basSKU'] = $basSKU;
+        $this->bas_skus=collect();
+        $this->bas_skus->add($basSKU);
     }
 
     /**
@@ -33,15 +42,15 @@ class SyncUpdateCommodityBasSkusTest extends TestCase
      */
     public function testSyncCommodityUpdated()
     {
-        $this->updated_at = config('sync.commodity_sync.updated_at');
-        $this->last_time = ValueStore::query()->where('name',$this->updated_at)->value('value');
-        if (!$this->last_time) $time=Carbon::now()->subSeconds(65);
-        $this->bas_skus= OracleBasSKU::query()
-            ->select('customerid','sku','descr_c','alternate_sku1','alternate_sku2','alternate_sku3','skulength','skuwidth','skuhigh','cube','packid','addtime','edittime')
-            ->where('EditTime', '>=', $this->last_time??$time)
-            ->whereColumn('EditTime', '<>', 'addTime')
-            ->orderByDesc('EditTime')
-            ->get();
+//        $this->updated_at = config('sync.commodity_sync.updated_at');
+//        $this->last_time = ValueStore::query()->where('name',$this->updated_at)->value('value');
+//        if (!$this->last_time) $time=Carbon::now()->subSeconds(65);
+//        $this->bas_skus= OracleBasSKU::query()
+//            ->select('customerid','sku','descr_c','alternate_sku1','alternate_sku2','alternate_sku3','skulength','skuwidth','skuhigh','cube','packid','addtime','edittime')
+//            ->where('EditTime', '>=', $this->last_time??$time)
+//            ->whereColumn('EditTime', '<>', 'addTime')
+//            ->orderByDesc('EditTime')
+//            ->get();
         $this->service->syncUpdateCommodity($this->bas_skus);
 
         $owner_sku_map = [];
@@ -84,12 +93,13 @@ class SyncUpdateCommodityBasSkusTest extends TestCase
 
     public function tearDown(): void
     {
-        ValueStore::query()->updateOrCreate([
-            'name' => $this->updated_at,
-        ], [
-            'name' => $this->updated_at,
-            'value' => $this->last_time,
-        ]);
+//        ValueStore::query()->updateOrCreate([
+//            'name' => $this->updated_at,
+//        ], [
+//            'name' => $this->updated_at,
+//            'value' => $this->last_time,
+//        ]);
+        $this->data['owner']->delete();
         $commodityIds=[];
         foreach ($this->commodities as $commodity){
             array_push($commodityIds,$commodity->id);