Merge branch 'dev' of shop/php into master

app/controller/api/user/User.php

@@ -3373,40 +3373,13 @@ class User extends BaseController
 
     public function getAmountFromGzc()
     {
-//        $uid = $this->request->uid();
-//        $userInfo = Db::name('UserCertification')->where('uid', $uid)->field('user_name,user_card')->find();
-//        $res = GzcApiRequest::checkAmount($userInfo);
-//
-//        return app('json')->success(['amount' => sprintf("%01.2f", $res['extendData']['amount'] * 0.01)]);
         $uid = $this->request->uid();
-        $userInfo = Db::name('UserCertification')->where('uid', $uid)->field('user_name,user_card')->find();
-
-        if (empty($userInfo['user_name']) || empty($userInfo['user_card'])) {
-            Log::error('[getAmountFromGzc] 用户实名信息缺失', ['uid' => $uid, 'userInfo' => $userInfo]);
-            return app('json')->fail('未找到用户实名信息');
-        }
-
-        try {
-            // 储蓄保
-            $res = GzcApiRequest::checkAmount($userInfo);
-        } catch (\Throwable $e) {
-            Log::error('[getAmountFromGzc] 调用异常', ['uid' => $uid, 'error' => $e->getMessage()]);
-            return app('json')->fail('查询失败（第三方异常）');
+        $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);
         }
-
-        // 提取 amount（兼容多种字段位置）
-        $amountCents = $res['extendData']['amount'] ?? $res['data']['amount'] ?? $res['amount'] ?? null;
-        $amount = $amountCents === null ? 0.0 : floatval($amountCents) * 0.01;
-        $formatted = sprintf('%.2f', $amount);
-
-        // 从 checkAmount 返回的 debug（若存在）
-        $debug = $res['debug'] ?? null;
-
-        // 返回 amount 与 debug 给调用方（前端 / 调试）
-        return app('json')->success([
-            'amount' => $formatted,
-            'debug'  => $debug
-        ]);
+        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,76 +56,38 @@ trait GzcApiRequest
      */
     public static function checkAmount($user)
     {
-//        $data = [
-//            'platformNo' => env('GZC.PLATFORM_NO'),
-//            'appNo' => env('GZC.APP_NO'),
-//            'conName' => $user['user_name'],
-//            'conCertType' => 1,
-//            'conCertNo' => $user['user_card'],
-//        ];
-//        return self::request('POST', '/v1/api/third/in/in30', $data);
-        $debug = [];
-
-        $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,
-            'conCertNo'  => $user['user_card'] ?? '',
+            'appNo' => env('GZC.APP_NO'),
+            'conName' => $user['user_name'],
+            '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'];
+        }
 
-        $debug['request'] = $data;
-
-        $res1 = self::getAmount($user,$data);
-
-        $data2 = [
+        $xfbData = [
             'platformNo' => env('XINGFUBAO.PLATFORM_NO'),
-            'appNo'      => env('XINGFUBAO.APP_NO'),
-            'conName'    => $user['user_name'] ?? '',
-            'conCertType'=> 1,
-            'conCertNo'  => $user['user_card'] ?? '',
+            'appNo' => env('XINGFUBAO.APP_NO'),
+            'conName' => $user['user_name'],
+            'conCertType' => $cardType,
+            'conCertNo' => $user['user_card'],
         ];
-        $res2 = self::getAmount($user,$data2);
-        return $res1 + $res2;
-    }
-
-    private static function getAmount($user,$data)
-    {
-        try {
-            $res = self::request('POST', '/v1/api/third/in/in30', $data);
-
-
-            // 尝试解析 amount（以分为单位常见）
-            $amountCents = $res['extendData']['amount'] ?? $res['data']['amount'] ?? $res['amount'] ?? null;
-
-            // 如果没有 amount 字段或为0，附加简单推测
-            if ($amountCents === null) {
-                $debug['note'] = 'missing_amount';
-                Log::warning('[checkAmount] missing amount', ['user' => $user, 'response' => $res]);
-            } elseif ($amountCents == 0) {
-                $msg = $res['msg'] ?? $res['message'] ?? '';
-                $reasons = [];
-                if (stripos($msg, '未开户') !== false || stripos($msg, '未实名') !== false) $reasons[] = 'third_party_unopened_or_unverified';
-                if (stripos($msg, '无账户') !== false) $reasons[] = 'account_not_found';
-                if (stripos($msg, 'token') !== false) $reasons[] = 'token_issue_possible';
-                if (empty($reasons)) $reasons[] = 'balance_is_zero';
-                $debug['zero_reasons'] = $reasons;
-            }
-
-            // 把 debug 附加到返回（不破坏原始返回结构）
-            if (is_array($res)) {
-                $res['debug'] = $debug;
-                return $res;
-            }
-
-            return $amountCents;
-        } catch (\Throwable $e) {
-            $debug['exception'] = $e->getMessage();
-            Log::error('[checkAmount] exception', ['user' => $user, 'err' => $e->getMessage()]);
-            return ['code' => 500, 'msg' => 'exception', 'debug' => $debug];
+        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()
     {
         $uid = $this->request->uid();
@@ -163,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);
@@ -180,73 +146,14 @@ 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);
     }
 
-    /**
-     * @param $user
-     * @return array|mixed|string
-     * @author 史晨
-     * @date 2025/10/22 11:05
-     * 幸福保账户获取养老金
-     */
-    public static function getAmountXfb($user)
-    {
-        $debug = [];
-
-        $data = [
-            'platformNo' => env('XINGFUBAO.PLATFORM_NO'),
-            'appNo'      => env('XINGFUBAO.APP_NO'),
-            'conName'    => $user['user_name'] ?? '',
-            'conCertType'=> 1,
-            'conCertNo'  => $user['user_card'] ?? '',
-        ];
-
-        $debug['request'] = $data;
-
-        try {
-            // 记录请求（原有日志可保留或删除）
-            Log::info('[checkAmount] request', $data);
-
-            $res = self::request('POST', '/v1/api/third/in/in30', $data);
-
-            $debug['raw_response'] = $res;
-
-            // 尝试解析 amount（以分为单位常见）
-            $amountCents = $res['extendData']['amount'] ?? $res['data']['amount'] ?? $res['amount'] ?? null;
-            $debug['parsed_amount'] = $amountCents;
-
-            // 如果没有 amount 字段或为0，附加简单推测
-            if ($amountCents === null) {
-                $debug['note'] = 'missing_amount';
-                Log::warning('[checkAmount] missing amount', ['user' => $user, 'response' => $res]);
-            } elseif ($amountCents == 0) {
-                $msg = $res['msg'] ?? $res['message'] ?? '';
-                $reasons = [];
-                if (stripos($msg, '未开户') !== false || stripos($msg, '未实名') !== false) $reasons[] = 'third_party_unopened_or_unverified';
-                if (stripos($msg, '无账户') !== false) $reasons[] = 'account_not_found';
-                if (stripos($msg, 'token') !== false) $reasons[] = 'token_issue_possible';
-                if (empty($reasons)) $reasons[] = 'balance_is_zero';
-                $debug['zero_reasons'] = $reasons;
-                Log::warning('[checkAmount] amount is 0', ['user' => $user, 'reasons' => $reasons]);
-            }
-
-            // 把 debug 附加到返回（不破坏原始返回结构）
-            if (is_array($res)) {
-                $res['debug'] = $debug;
-                return $res;
-            }
-
-            // 如果不是数组，包装返回
-            return ['code' => 200, 'msg' => 'ok', 'extendData' => ['amount' => $amountCents], 'debug' => $debug];
-        } catch (\Throwable $e) {
-            $debug['exception'] = $e->getMessage();
-            Log::error('[checkAmount] exception', ['user' => $user, 'err' => $e->getMessage()]);
-            return ['code' => 500, 'msg' => 'exception', 'debug' => $debug];
-        }
-    }
-
 }