From 8758c5e9d1fb3ac3c8bbccd0a55841a77c6d6e9a Mon Sep 17 00:00:00 2001
From: Jing Li <lym125@gmail.com>
Date: Sat, 22 Jan 2022 15:30:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Services/OrderPackageService.php | 31 ----------------------
 app/Services/Kuaidi100Service.php          | 10 -------
 2 files changed, 41 deletions(-)

diff --git a/app/Admin/Services/OrderPackageService.php b/app/Admin/Services/OrderPackageService.php
index 10e7d5ec..9dc7a728 100644
--- a/app/Admin/Services/OrderPackageService.php
+++ b/app/Admin/Services/OrderPackageService.php
@@ -52,9 +52,6 @@ class OrderPackageService
             $_orderProduct->decrement('remain_quantity', $product['quantity']);
         }
 
-<<<<<<< Updated upstream
-
-
         if (!$package) {
             //创建发货单数据
             $package = new OrderPackage();
@@ -99,34 +96,6 @@ class OrderPackageService
                     'updated_at' => $package->created_at,
                 ]);
             }, $packageProducts));
-=======
-        //创建发货单数据
-        $package = new OrderPackage();
-        $package->order_id = $order->id;
-        $package->user_id = $order->user_id;
-        $package->consignee_name = $order->consignee_name;
-        $package->consignee_telephone = $order->consignee_telephone;
-        $package->consignee_zone = $order->consignee_zone;
-        $package->consignee_address = $order->consignee_address;
-
-        $package->shipping_company = $params['shipping_company'];
-        $package->shipping_code = Arr::get(Kuaidi100Service::$codeArr, $package->shipping_company, '');
-        $package->shipping_number = $params['shipping_number'];
-
-        //保存发货单
-        $package->save();
-        //保存发货单商品
-        OrderPackageProduct::insert(array_map(function ($value) use ($package) {
-            return array_merge($value, [
-                'order_package_id'  => $package->id,
-                'created_at' => $package->created_at,
-                'updated_at' => $package->created_at,
-            ]);
-        }, $packageProducts));
-        if (config('settings.kuaidi100_is_use')) {
-            $kuaidi100Service = new Kuaidi100Service();
-            $kuaidi100Service->poll($package->shipping_number, $package->shipping_code, $package->consignee_telephone);
->>>>>>> Stashed changes
         }
 
         //更新订单状态
diff --git a/app/Services/Kuaidi100Service.php b/app/Services/Kuaidi100Service.php
index 0976b963..be4a0030 100644
--- a/app/Services/Kuaidi100Service.php
+++ b/app/Services/Kuaidi100Service.php
@@ -1403,17 +1403,11 @@ class Kuaidi100Service
                 $package->update([
                     'last_news'=> empty($lastNews) ? '' : $lastNews['context'],
                 ]);
-<<<<<<< Updated upstream
                 try {
                     //更新包裹状态
                     (new OrderPackageService())->updatePackageStatus($package, $status);
                 } catch (OrderPackageAlreadyCheckedException $e) {
                 }
-=======
-                //更新包裹状态
-                $orderService = new OrderService();
-                $orderService->updatePackageStatus($package, $status);
->>>>>>> Stashed changes
             }
             //记录物流信息
             KuaidiLog::updateOrCreate([
@@ -1494,11 +1488,7 @@ class Kuaidi100Service
      */
     public function unPollSign(string $sign, array $params)
     {
-<<<<<<< Updated upstream
         return $sign === strtoupper(md5(json_encode($params, JSON_UNESCAPED_UNICODE).app_settings('kuaidi100.secret')));
-=======
-        return $sign === strtoupper(md5(json_encode($params, JSON_UNESCAPED_UNICODE).config('settings.kuaidi100_secret')));
->>>>>>> Stashed changes
     }
 
     public function getStatusName($state = 0)