From 8e2665e50fa881cbe661792016ef51f8c95f26f3 Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Thu, 18 Jul 2024 09:51:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=92100=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E9=A1=BA=E4=B8=B0=E6=8E=A5=E5=8F=A3=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=B7=BB=E5=8A=A0=E6=89=8B=E6=9C=BA=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/shop/logic/order/OrderLogic.php | 7 ++++++-
 extend/expressage/Kd100.php         | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/shop/logic/order/OrderLogic.php b/app/shop/logic/order/OrderLogic.php
index e38fadc6..f6cb219b 100644
--- a/app/shop/logic/order/OrderLogic.php
+++ b/app/shop/logic/order/OrderLogic.php
@@ -361,8 +361,13 @@ class OrderLogic extends Logic
         if ($shipping_code === 'SF' && $express === 'kdniao') {
             $expressage->logistics($shipping_code, $order['invoice_no'], substr($order['mobile'],-4));
         }else {
-            $expressage->logistics($shipping_code, $order['invoice_no']);
+            $phone = '';
+            if ($shipping_code === 'shunfeng') {
+                $phone = $order['mobile'];
+            }
+            $expressage->logistics($shipping_code, $order['invoice_no'], $phone);
         }
+
         $traces = $expressage->logisticsFormat();
         if ($traces == false) {
             $traces[] = [$expressage->getError()];
diff --git a/extend/expressage/Kd100.php b/extend/expressage/Kd100.php
index 81593e7d..a7f68896 100644
--- a/extend/expressage/Kd100.php
+++ b/extend/expressage/Kd100.php
@@ -7,9 +7,9 @@ use Requests;
 class Kd100 extends Expressage
 {
 
-    public function logistics($code, $number, $extra = "")
+    public function logistics($code, $number, $phone = '')
     {
-        $request_data = '{"com":"' . $code . '","num":"' . $number . '","from":"","phone":"","to":"","resultv2":"0","show":"0","order":"desc"}';
+        $request_data = '{"com":"' . $code . '","num":"' . $number . '","from":"","phone":"'. $phone .'","to":"","resultv2":"0","show":"0","order":"desc"}';
 
         $datas = array(
             'customer'  => $this->app,