公证处检测问题

app/controller/api/user/User.php

@@ -3376,10 +3376,17 @@ class User extends BaseController
         $uid = $this->request->uid();
         $userInfo = Db::name('UserCertification')->where('uid', $uid)->field('user_name,user_card,card_type')->find();
         $res = GzcApiRequest::checkAmount($userInfo);
-        if(is_string($res)) {
-            return app('json')->fail($res);
-        }
-        return app('json')->success(['amount' => sprintf("%01.2f", $res * 0.01)]);
+        if (!is_array($res) || ($res['code'] ?? -1) !== 0) {
+            return app('json')->fail(
+                $res['message'] ?? '查询失败',
+                [
+                    'code' => $res['code'] ?? -1,
+                    'debug' => $res['debug'] ?? null,
+                ]
+            );//
+        }
+        $amountCents = $res['extendData']['amount'] ?? $res['data']['amount'] ?? $res['amount'] ?? 0;
+        return app('json')->success(['amount' => sprintf('%01.2f', floatval($amountCents) * 0.01)]);
     }
 
     public function check_user_annual_fee()

app/traits/GzcApiRequest.php

@@ -23,30 +23,102 @@ trait GzcApiRequest
         $base_uri = env('GZC.HOSTNAME');
         $request_uri = $base_uri.$url;
         try {
-            $data  = json_encode($params);
-            $headerArray =array(
+            $data = json_encode($params);
+            $headers = [
                 "Content-type:application/json;charset='utf-8'",
                 "Accept:application/json"
-            );
-            if ($url != '/v1/api/third/auth/token') {
+            ];
+            if ($url !== '/v1/api/third/auth/token') {
                 $Token = self::getTokenFromServer($type);
-                $accessToken = $Token['extendData']['accessToken'];
-                array_push($headerArray, "token:".$accessToken);
+                if (isset($Token['extendData']['accessToken']) && $Token['extendData']['accessToken']) {
+                    $headers[] = "token:".$Token['extendData']['accessToken'];
+                } else {
+                    return [
+                        'code' => -1,
+                        'message' => 'token获取失败',
+                        'debug' => [
+                            'raw' => $Token,
+                            'http_code' => null
+                        ]
+                    ];
+                }
+            }
+            if (!empty($options['headers']) && is_array($options['headers'])) {
+                $headers = array_merge($headers, $options['headers']);
             }
             Log::info($data);
             $curl = curl_init();
-            curl_setopt($curl, CURLOPT_URL, $request_uri);
-            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
-            curl_setopt($curl, CURLOPT_SSL_VERIFYHOST,FALSE);
-            curl_setopt($curl, CURLOPT_POST, 1);
-            curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
-            curl_setopt($curl,CURLOPT_HTTPHEADER,$headerArray);
-            curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+            $methodUpper = strtoupper($method);
+            $urlToRequest = $request_uri;
+            if ($methodUpper === 'GET' && !empty($params)) {
+                $query = http_build_query($params);
+                $urlToRequest .= (strpos($urlToRequest, '?') === false ? '?' : '&').$query;
+            }
+            curl_setopt($curl, CURLOPT_URL, $urlToRequest);
+            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);
+            curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+            if (!empty($options['timeout'])) {
+                curl_setopt($curl, CURLOPT_TIMEOUT, (int)$options['timeout']);
+            }
+            if ($methodUpper === 'POST') {
+                curl_setopt($curl, CURLOPT_POST, true);
+                curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
+            } elseif ($methodUpper !== 'GET') {
+                curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $methodUpper);
+                if (!empty($params)) {
+                    curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
+                }
+            }
+            curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
             $output = curl_exec($curl);
+            $httpCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+            $curlErrNo = curl_errno($curl);
+            $curlErr = $curlErrNo ? curl_error($curl) : null;
             curl_close($curl);
-            return json_decode($output, true);
+            if ($curlErrNo) {
+                return [
+                    'code' => -1,
+                    'message' => $curlErr ?: '请求错误',
+                    'debug' => [
+                        'http_code' => $httpCode,
+                        'curl_errno' => $curlErrNo,
+                        'raw' => $output
+                    ]
+                ];
+            }
+            if ($httpCode < 200 || $httpCode >= 300) {
+                return [
+                    'code' => -1,
+                    'message' => 'HTTP状态异常',
+                    'debug' => [
+                        'http_code' => $httpCode,
+                        'raw' => $output
+                    ]
+                ];
+            }
+            $decoded = json_decode($output, true);
+            if (is_array($decoded)) {
+                $decoded['debug'] = [
+                    'http_code' => $httpCode,
+                    'raw' => $output
+                ];
+                return $decoded;
+            }
+            return [
+                'code' => -1,
+                'message' => '返回解析失败',
+                'debug' => [
+                    'http_code' => $httpCode,
+                    'raw' => $output
+                ]
+            ];
         } catch (\Throwable $e) {
-            return $e->getMessage();
+            return [
+                'code' => -1,
+                'message' => $e->getMessage(),
+                'debug' => null
+            ];
         }
     }
     /**
@@ -67,8 +139,12 @@ trait GzcApiRequest
         Log::info('储蓄保养老金请求参数：' . json_encode($cxbData));
         $cxbResponseData = self::request('POST', '/v1/api/third/in/in30', $cxbData, [], 1);
         Log::info('储蓄保养老金请求返回：' . json_encode($cxbResponseData));
-        if($cxbResponseData['code'] != 0) {
-            return $cxbResponseData['message'];
+        if (!is_array($cxbResponseData) || ($cxbResponseData['code'] ?? -1) != 0) {
+            return [
+                'code' => $cxbResponseData['code'] ?? -1,
+                'message' => $cxbResponseData['message'] ?? '储蓄保查询失败',
+                'debug' => $cxbResponseData['debug'] ?? null,
+            ];
         }
 
         $xfbData = [
@@ -81,12 +157,28 @@ trait GzcApiRequest
         Log::info('幸福保养老金请求参数：' . json_encode($xfbData));
         $xfbResponseData = self::request('POST', '/v1/api/third/in/in30', $xfbData, [], 2);
         Log::info('幸福保养老金请求返回：' . json_encode($xfbResponseData));
-        if($xfbResponseData['code'] != 0) {
-            return $xfbResponseData['message'];
+        if (!is_array($xfbResponseData) || ($xfbResponseData['code'] ?? -1) != 0) {
+            return [
+                'code' => $xfbResponseData['code'] ?? -1,
+                'message' => $xfbResponseData['message'] ?? '幸福保查询失败',
+                'debug' => $xfbResponseData['debug'] ?? null,
+            ];
         }
 
-        $amount = $cxbResponseData['extendData']['amount'] + $xfbResponseData['extendData']['amount'];
-        return $amount;
+        $amountCxb = $cxbResponseData['extendData']['amount'] ?? $cxbResponseData['data']['amount'] ?? $cxbResponseData['amount'] ?? 0;
+        $amountXfb = $xfbResponseData['extendData']['amount'] ?? $xfbResponseData['data']['amount'] ?? $xfbResponseData['amount'] ?? 0;
+        $amount = $amountCxb + $amountXfb;
+        return [
+            'code' => 0,
+            'message' => 'success',
+            'extendData' => [
+                'amount' => $amount
+            ],
+            'debug' => [
+                'cxb' => $cxbResponseData['debug'] ?? null,
+                'xfb' => $xfbResponseData['debug'] ?? null,
+            ],
+        ];
     }
     public function getAmountFromGzc()
     {