From 340c4a8be0a9e41d8986fad56c479070c726b2b2 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Mon, 21 Mar 2022 22:22:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=A9=E6=B5=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9C=89=E7=9A=84=E5=BF=AB=E9=80=92=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=9F=A5=E8=AF=A2=E5=88=B0=E7=89=A9=E6=B5=81?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/services/shipping/ExpressServices.php | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/crmeb/app/services/shipping/ExpressServices.php b/crmeb/app/services/shipping/ExpressServices.php
index 2ffb7415e..819ec0405 100644
--- a/crmeb/app/services/shipping/ExpressServices.php
+++ b/crmeb/app/services/shipping/ExpressServices.php
@@ -33,6 +33,20 @@ class ExpressServices extends BaseServices
 {
     public $_cacheKey = "plat_express_list";
 
+    //物流查询物流公司code
+    public $express_code = [
+        'yunda' => 'yunda',
+        'yundakuaiyun' => 'yunda56',
+        'ems' => 'EMS',
+        'youzhengguonei' => 'chinapost',
+        'huitongkuaidi' => 'HTKY',
+        'baishiwuliu' => 'BSKY',
+        'shentong' => 'STO',
+        'jd' => 'JD',
+        'zhongtong' => 'ZTO',
+        'zhongtongkuaiyun' => 'ZTO56',
+    ];
+
     /**
      * 构造方法
      * ExpressServices constructor.
@@ -63,6 +77,7 @@ class ExpressServices extends BaseServices
     {
         return $this->dao->getExpressList([], '*', 0, 0);
     }
+
     /**
      * 物流表单
      * @param array $formData
@@ -164,7 +179,7 @@ class ExpressServices extends BaseServices
 
     public function expressList($where = [])
     {
-        if(empty($where)) $where =  ['is_show' => 1];
+        if (empty($where)) $where = ['is_show' => 1];
         return $this->dao->getExpressList($where, 'id,name,code,partner_id,partner_key,net,account,key,net_name', 0, 0);
     }
 
@@ -180,6 +195,7 @@ class ExpressServices extends BaseServices
         $resultData = CacheService::get($cacheName, null);
         if ($resultData === null || !is_array($resultData)) {
             $data = [];
+            $com = $this->express_code[$com] ?? '';
             $cacheTime = 0;
             switch ((int)sys_config('logistics_type')) {
                 case 1:
@@ -196,7 +212,7 @@ class ExpressServices extends BaseServices
                     }
                     break;
                 case 2:
-                    $result = ExpressService::query($expressNum);
+                    $result = ExpressService::query($expressNum, $com);
                     if (is_array($result) &&
                         isset($result['result']) &&
                         isset($result['result']['deliverystatus']) &&