解决冲突

app/Endpoint/Api/Http/Controllers/Order/OrderController.php

@@ -117,11 +117,7 @@ class OrderController extends Controller
     {
         $order = $request->user()->orders()->findOrFail($id);
         $order->load('products');
-<<<<<<< Updated upstream
         $order->load('lastPackage');
-=======
-        $order->load('packages');
->>>>>>> Stashed changes
 
         return OrderResource::make($order);
     }
@@ -209,26 +205,4 @@ class OrderController extends Controller
             'shipping_info'=> KuaidiLog::where(['number'=>$package->shipping_number, 'code'=>$package->shipping_code])->first()?->info,
         ]));
     }
-
-    /**
-     * 订单包裹列表
-     */
-    public function orderPackages($id, Request $request)
-    {
-        $order = $request->user()->orders()->findOrFail($id);
-        return OrderPackageResource::collection($order->packages()->where('is_failed', false)->orderBy('updated_at', 'desc')->get());
-    }
-
-    /**
-     * 物流包裹的明细
-     *
-     * @return void
-     */
-    public function shippingInfo($id, Request $request)
-    {
-        $package = $request->user()->orderPackages()->where('is_failed', false)->findOrFail($id);
-        return response()->json(array_merge(OrderPackageResource::make($package)->resolve(), [
-            'shipping_info'=> KuaidiLog::where(['number'=>$package->shipping_number, 'code'=>$package->shipping_code])->first()?->info,
-        ]));
-    }
 }

app/Endpoint/Api/Http/Resources/OrderResource.php

@@ -36,11 +36,7 @@ class OrderResource extends JsonResource
             'created_at' => $this->created_at->toDateTimeString(),
             'expires_at' => $this->expires_at,
 
-<<<<<<< Updated upstream
             'packages' => OrderPackageResource::make($this->whenLoaded('lastPackage')),
-=======
-            'packages' => OrderPackageResource::make($this->whenloaded('packages')->where('is_failed', false)->sortBy('created_at')->first()),
->>>>>>> Stashed changes
         ];
     }
 }

app/Endpoint/Api/routes.php

@@ -211,9 +211,9 @@ Route::group([
 
 
     //商品列表
-    Route::get('products', [Dealer\ProductController::class, 'index']);
+    Route::get('/dealer/products', [Dealer\ProductController::class, 'index']);
     //商品详情
-    Route::get('products/{id}', [Dealer\ProductController::class, 'show']);
+    Route::get('/dealer/products/{id}', [Dealer\ProductController::class, 'show']);
 
     Route::group([
         'prefix'=>'dealer',