ANG YU 4 rokov pred
rodič
commit
c56fba2a35

+ 7 - 4
app/Services/OrderPackageService.php

@@ -349,7 +349,7 @@ class OrderPackageService
      * @param $logistic_numbers array
      * @return array
      */
-    public function collectUpload(array $logistic_numbers=[]): array
+    public function collectUpload(array $logistic_numbers = []): array
     {
         //参数校验
         if (empty($logistic_numbers)) {
@@ -409,15 +409,18 @@ class OrderPackageService
             $response = Http::withHeaders($headers)->withBody($body, 'application/json')->post($url);
             $responseBody = json_decode($response->body());
             if ($responseBody->statusCode === 'S210' ||//无权限
-                $responseBody->statusCode === 'PARAM_ERROR'||//揽收上传信息为空
+                $responseBody->statusCode === 'PARAM_ERROR' ||//揽收上传信息为空
                 $responseBody->statusCode === 'SYSTEM_ERROR'//系统异常,请联系系统管理员
             ) {
-                $errorMessage[] = $responseBody->statusCode;
+                $errorMessage[] = [
+                    'status_code' => $responseBody->statusCode,
+                    'message' => $responseBody->message,
+                ];
             }
         }
         if (empty($errorMessage)) {
             return ['success' => true, 'message' => '一键揽收上传成功'];
-        }else{
+        } else {
             return ['success' => false, 'message' => $errorMessage];
         }
     }

+ 2 - 2
config/api_logistic.php

@@ -211,8 +211,8 @@ return [
         'ZTO' => [
             'test' => [
                 'url' => 'https://japi-test.zto.com/zto.network.collectUpload',
-                'x-appKey' => 'c51c718eb899e9f706979',
-                'appSecret' => '9f664e3ab08049874aa417720840161a',
+                'x-appKey' => '67af93a877a027581b775',
+                'appSecret' => 'c47eda396cc4d0739c45524a839f48c9',
                 'appId' => 'GJWL',
             ],
             'prod' =>[