From bb69a26eff63e1baa8767155a27f008c4d104a06 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Mon, 19 Jun 2023 18:15:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=89=A9=E6=B5=81?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8=E8=8E=B7=E5=8F=96=E7=94=B5=E5=AD=90=E9=9D=A2?=
 =?UTF-8?q?=E5=8D=95=E6=A8=A1=E7=89=88=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/crmeb/services/HttpService.php             | 9 +++++++--
 crmeb/crmeb/services/express/storage/Express.php | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/crmeb/crmeb/services/HttpService.php b/crmeb/crmeb/services/HttpService.php
index e9f09ed4d..53688523b 100644
--- a/crmeb/crmeb/services/HttpService.php
+++ b/crmeb/crmeb/services/HttpService.php
@@ -88,8 +88,13 @@ class HttpService
         $method = strtoupper($method);
         //请求方式
         curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $method);
-        //post请求
-        if ($method == 'POST') curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
+        //携带参数
+        if ($method == 'POST') {
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
+        } elseif ($method == 'GET' && count($data)) {
+            $url .= '?' . http_build_query($data);
+            curl_setopt($curl, CURLOPT_URL, $url);
+        }
         //超时时间
         curl_setopt($curl, CURLOPT_TIMEOUT, $timeout);
         //设置header头
diff --git a/crmeb/crmeb/services/express/storage/Express.php b/crmeb/crmeb/services/express/storage/Express.php
index 1705ac371..eff8a5254 100644
--- a/crmeb/crmeb/services/express/storage/Express.php
+++ b/crmeb/crmeb/services/express/storage/Express.php
@@ -30,7 +30,7 @@ class Express extends BaseExpress
     /**
      * 电子面单模版
      */
-    const EXPRESS_TEMP = 'v2/expr/temp';
+    const EXPRESS_TEMP = 'v2/expr_dump/temp';
 
     /**
      * 快递公司

From 2e01027ce153b56072e2f306e335c5b3f6b68ea2 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Mon, 19 Jun 2023 18:24:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/order/StoreOrderDeliveryServices.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crmeb/app/services/order/StoreOrderDeliveryServices.php b/crmeb/app/services/order/StoreOrderDeliveryServices.php
index 69fb0f191..fde0f1564 100644
--- a/crmeb/app/services/order/StoreOrderDeliveryServices.php
+++ b/crmeb/app/services/order/StoreOrderDeliveryServices.php
@@ -577,6 +577,7 @@ class StoreOrderDeliveryServices extends BaseServices
 //                throw new AdminException('商家寄件未开启无法寄件');
 //            }
             $dump = $expressService->express()->shippmentCreateOrder($expData, sys_config('yihaotong_send_appid', ''));
+            Log::error('商家寄件返回数据：' . json_encode($dump));
             $orderInfo->delivery_id = $dump['kuaidinum'] ?? '';
             $data['express_dump'] = json_encode([
                 'com' => $expData['kuaidicom'],
@@ -624,6 +625,7 @@ class StoreOrderDeliveryServices extends BaseServices
                 'kuaidi_label' => $data['kuaidi_label'],
                 'kuaidi_task_id' => $data['kuaidi_task_id'],
                 'kuaidi_order_id' => $data['kuaidi_order_id'],
+                'express_dump' => $data['express_dump']
             ];
 
             /** @var StoreOrderStatusServices $services */