订单同步修改及测试修改

app/Console/Commands/SyncWMSOrderTask.php

@@ -64,7 +64,7 @@ class SyncWMSOrderTask extends Command
 
         $orderHeaders = $orderService->filterOrderByCache($orderHeaders,$newest_list);                  // 对比缓存
 
-        if(count($orderHeaders)>0 && count($orderHeaders) >0){
+        if(count($last_order)>0 && count($orderHeaders) >0){
             $orderService->syncOrder($orderHeaders);                                                //  同步订单
             $orderService->cancelOrderCache($newest_list,$prefixKey);                                   //  清除缓存
             $orderService->pushOrderCache($renewal_orders,$prefixKey,$hasKey,$newest_list);             //  添加缓存

app/Services/OrderService.php

@@ -771,8 +771,7 @@ class OrderService
         return  $orders ? $orders->first() : null ;
     }
 
-    // TODO
-    public function syncOrder(&$orderHeaders)
+     public function syncOrder(&$orderHeaders)
     {
         /**
          * @var OrderPackageService $packageService
@@ -781,7 +780,7 @@ class OrderService
         $this->syncOrderByWMSOrderHeaders($orderHeaders);
         $packageService->syncOrderPackage($orderHeaders);
     }
-    // TODO
+
     public function syncOrderByWMSOrderHeaders(&$orderHeaders)
     {
         if($orderHeaders->isEmpty())return [];
@@ -820,7 +819,7 @@ class OrderService
         });
         $this->batchUpdate($update_params);
     }
-    // TODO
+
     public function getCreateOrderModelsByWMSOrderHeaders($orderHeaders,$orders,$warehouses,$owners,$logistics,$shops)
     {
         /** @var DataHandlerService $dataHandlerService */
@@ -845,7 +844,7 @@ class OrderService
         }
         return $inner_params;
     }
-    // TODO
+
     public function getUpdateOrderModelByWMSOrderHeaders($orderHeaders,$orders,$warehouses,$owners,$logistics,$shops)
     {
         /**
@@ -871,7 +870,7 @@ class OrderService
         }
         return $collect;
     }
-    // TODO
+
     public function getCreateOrderModels(&$orderHeader,&$warehouse_map,&$owner_map,&$logistic_map,&$shop_map,$date)
     {
         /** @var DataHandlerService $dataHandlerService */
@@ -953,7 +952,7 @@ class OrderService
         }
     }
 
-    // TODO
+
     public function createOrFindOrder($orderHeader)
     {
         $order = Order::query()->where('code',$orderHeader->orderno)->first();
@@ -968,7 +967,7 @@ class OrderService
             return null;
         }
     }
-    // TODO
+
     public function createOrFindOrderInfo($orderHeader)
     {
         /**
@@ -991,7 +990,7 @@ class OrderService
     }
 
 
-    // TODO
+
     public function setOrderSyncAt($key,$date,$bool=true){
         if($bool){
             ValueStore::query()->where('name',$key)->update(['value'=>Carbon::parse($date)->subSeconds(1)]);
@@ -999,7 +998,7 @@ class OrderService
             ValueStore::query()->where('name',$key)->update(['value'=>$date]);
         }
     }
-    // TODO
+
     public function getOrderSyncAt($key,$type='newest'){
         $keyValue = ValueStore::query()->where('name',$key)->first();
         if($keyValue->value)return $keyValue->value;
@@ -1008,7 +1007,7 @@ class OrderService
         if($order)return $order->created_at;
         return Carbon::now()->subSeconds(65);
     }
-    // TODO
+
     public function pushOrderCache($orderHeaders,$prefixKey,$hasKey,$list_key){
         $list = [];
         try {
@@ -1025,7 +1024,7 @@ class OrderService
 
         }
     }
-    // TODO
+
     public function filterOrderByCache($orderHeaders,$key)
     {
         /**
@@ -1043,10 +1042,11 @@ class OrderService
             return $orderHeaders;
         }
     }
-    // TODO
+
     public function cancelOrderCache($key,string $prefix)
     {
         try {
+            Redis::LLEN($key);
             $list = Cache::get($key);
             collect($list)->each(function ($item)use($prefix) {
                 Cache::forget($prefix.$item);
@@ -1055,7 +1055,7 @@ class OrderService
         } catch (\Exception $e) {
         }
     }
-    // TODO
+
     public function syncCreatedOrder(){
         /**
          * @var OracleDOCOrderHeaderService $oracleDOCOrderHeaderService
@@ -1082,7 +1082,7 @@ class OrderService
             $orderService->setOrderSyncAt($newest,$last_order->addTime,count($orderHeaders)>0);   //  更新时间
         }
     }
-    // TODO
+
     public function syncUpdatedOrder(){
         /**
          * @var OracleDOCOrderHeaderService $oracleDOCOrderHeaderService

tests/Services/OrderService/GetOrderSyncAtTest.php

@@ -30,7 +30,7 @@ class GetOrderSyncAtTest extends TestCase
         $this->assertNotEmpty($data);
     }
 
-    /**+
+    /**
      * @test
      */
     public function getUpdatedOrderSyncAt()