feat(api): 支持多平台养老金金额查询- 修改 request 方法支持传递平台类型参数

- 优化 getTokenFromServer 和 getSignContent 方法支持多平台 token 获取
- checkAmount 方法增加 card_type 参数支持- 实现储蓄保和幸福保两个平台的养老金金额查询逻辑
- 增加日志记录请求参数和返回结果
- 优化接口返回结果处理，支持错误信息直接返回

app/controller/api/user/User.php

@@ -3374,10 +3374,12 @@ class User extends BaseController
     public function getAmountFromGzc()
     {
         $uid = $this->request->uid();
-        $userInfo = Db::name('UserCertification')->where('uid', $uid)->field('user_name,user_card')->find();
+        $userInfo = Db::name('UserCertification')->where('uid', $uid)->field('user_name,user_card,card_type')->find();
         $res = GzcApiRequest::checkAmount($userInfo);
-
-        return app('json')->success(['amount' => sprintf("%01.2f", $res['extendData']['amount'] * 0.01)]);
+        if(is_string($res)) {
+            return app('json')->fail($res);
+        }
+        return app('json')->success(['amount' => sprintf("%01.2f", $res * 0.01)]);
     }
 
     public function check_user_annual_fee()

app/traits/GzcApiRequest.php

@@ -18,7 +18,7 @@ trait GzcApiRequest
      * @author php迷途小书童
      * @created 2021/1/14 14:34
      */
-    public static function request(string $method, string $url, array $params = [], array $options = [])
+    public static function request(string $method, string $url, array $params = [], array $options = [], $type = 1)
     {
         $base_uri = env('GZC.HOSTNAME');
         $request_uri = $base_uri.$url;
@@ -29,7 +29,7 @@ trait GzcApiRequest
                 "Accept:application/json"
             );
             if ($url != '/v1/api/third/auth/token') {
-                $Token = self::getTokenFromServer();
+                $Token = self::getTokenFromServer($type);
                 $accessToken = $Token['extendData']['accessToken'];
                 array_push($headerArray, "token:".$accessToken);
             }
@@ -56,14 +56,37 @@ trait GzcApiRequest
      */
     public static function checkAmount($user)
     {
-        $data = [
+        $cardType = $user['card_type'] ? $user['card_type'] : 10;
+        $cxbData = [
             'platformNo' => env('GZC.PLATFORM_NO'),
             'appNo' => env('GZC.APP_NO'),
             'conName' => $user['user_name'],
-            'conCertType' => 1,
+            'conCertType' => $cardType,
+            'conCertNo' => $user['user_card'],
+        ];
+        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'];
+        }
+
+        $xfbData = [
+            'platformNo' => env('XINGFUBAO.PLATFORM_NO'),
+            'appNo' => env('XINGFUBAO.APP_NO'),
+            'conName' => $user['user_name'],
+            'conCertType' => $cardType,
             'conCertNo' => $user['user_card'],
         ];
-        return self::request('POST', '/v1/api/third/in/in30', $data);
+        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'];
+        }
+
+        $amount = $cxbResponseData['extendData']['amount'] + $xfbResponseData['extendData']['amount'];
+        return $amount;
     }
     public function getAmountFromGzc()
     {
@@ -102,13 +125,17 @@ trait GzcApiRequest
      * @author php迷途小书童
      * @created 2021/1/14 14:38
      */
-    public static function getTokenFromServer()
+    public static function getTokenFromServer($type = 1)
     {
         $timestamp = (int)(microtime(true) * 1000);
-        $appid = env('GZC.APP_ID');
+        if ($type == 1) {
+            $appid = env('GZC.APP_ID');
+        }else{
+            $appid = env('XINGFUBAO.APP_ID');
+        }
         $data = [
             'appid' => $appid,
-            'sign' => self::getSignContent($timestamp, $appid),
+            'sign' => self::getSignContent($timestamp, $appid, $type),
             'timestamp' => $timestamp
         ];
         return self::request('POST', '/v1/api/third/auth/token', $data);
@@ -119,8 +146,12 @@ trait GzcApiRequest
      * @author php迷途小书童
      * @created 2020/10/29 9:35
      */
-    public static function getSignContent(int $timestamp, string $appid) {
-        $appsecret = md5(env('GZC.APP_SECRET'));
+    public static function getSignContent(int $timestamp, string $appid, $type = 1) {
+        if ($type == 1) {
+            $appsecret = md5(env('GZC.APP_SECRET'));
+        }else{
+            $appsecret = md5(env('XINGFUBAO.APP_SECRET'));
+        }
         $stringToBeSigned = "appid={$appid}&secret={$appsecret}&timestamp={$timestamp}";
         return md5($stringToBeSigned);
     }