From fd07df5e5840251dd0a2e52aa7c203ced5cf7a19 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Wed, 11 May 2022 13:40:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=8F=90=E8=B4=A7=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Endpoint/Api/Http/Controllers/Order/UnlineController.php | 5 +++--
 app/Listeners/OrderPackage.php                               | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Endpoint/Api/Http/Controllers/Order/UnlineController.php b/app/Endpoint/Api/Http/Controllers/Order/UnlineController.php
index 7aa6c9aa..bea873fe 100644
--- a/app/Endpoint/Api/Http/Controllers/Order/UnlineController.php
+++ b/app/Endpoint/Api/Http/Controllers/Order/UnlineController.php
@@ -44,6 +44,7 @@ class UnlineController extends Controller
      */
     public function package($id, Request $request)
     {
+        $user = $request->user();
         $request->validate([
             'products' => 'required|array',
             'products.*.id' => 'required',
@@ -75,8 +76,8 @@ class UnlineController extends Controller
                 throw new BizException('提货商品不存在');
             }
             $service_package->createPackage($order, [
-                'shipping_company' => '自提',
-                'shipping_number' => '0',
+                'shipping_company' => '提货',
+                'shipping_number' => $user->id,
                 'packages' => $package_params
             ]);
             DB::commit();
diff --git a/app/Listeners/OrderPackage.php b/app/Listeners/OrderPackage.php
index 66215ffb..ba453fd7 100644
--- a/app/Listeners/OrderPackage.php
+++ b/app/Listeners/OrderPackage.php
@@ -55,7 +55,7 @@ class OrderPackage
                 // 发货
                 if (count($package_params) > 0) {
                     $service_package->createPackage($order, [
-                        'shipping_company' => '自提',
+                        'shipping_company' => '提货',
                         'shipping_number' => '0',
                         'packages' => $package_params
                     ]);