解决合并冲突

app/Services/OrderService.php

@@ -1088,6 +1088,7 @@ class OrderService
 
     public function cancelOrderCache($key,string $prefix)
     {
+
         try {
             Redis::LLEN($key);
             $list = Cache::get($key);
@@ -1095,7 +1096,9 @@ class OrderService
                 Cache::forget($prefix . $item);
             });
             Cache::put($key, []);
+        } catch (\Exception $e) {
         }
+
     }
 
     public function syncCreatedOrder(){

app/Services/OwnerService.php

@@ -240,19 +240,4 @@ Class OwnerService
             return Owner::query()->firstOrCreate(["code"=>$code],["code"=>$code,"name"=>$code]);
         });
     }
-    public function getOwnerByCodes($codes)
-    {
-        $collect = collect();
-        if(count($codes) == 0)return $collect;
-        foreach ($codes as $code) {
-            $collect->push(Cache::remember("getOwnerByCodes_{$code}", config('database.cache.expirations.rand'), function ()use($code){
-                $owner = Owner::query()->where('code',$code)->first();
-                if($owner) return $owner;
-                $basCustomer = OracleBasCustomer::query()->where('Customer_Type','OW')->where('CustomerID', $code)->first();
-                if(!$basCustomer)return null;
-                return Owner::query()->create(['name'=>$basCustomer['descr_c'],'code'=>$basCustomer['customerid']]);
-            }));
-        }
-        return $collect;
-    }
 }