Merge remote-tracking branch 'origin/dev' into dev

app/common/dao/user/UserCertificationDao.php

@@ -85,5 +85,18 @@ class UserCertificationDao extends BaseDao
         return $entityList;
     }
 
-
+    /**
+     * @param $mobile
+     * @return array|\think\db\BaseQuery|\think\Model|null
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @author 史晨
+     * @date 2025/10/20 17:21
+     * 获取用户实名信息
+     */
+    public function getUserCertification($mobile)
+    {
+        return $this->getModel()::getDB()->where('mobile', $mobile)->find();
+    }
 }

app/controller/api/Auth.php

@@ -12,7 +12,9 @@ namespace app\controller\api;
 
 use AlibabaCloud\Client\AlibabaCloud;
 use app\common\dao\store\order\StoreOrderDao;
+use app\common\dao\user\UserCertificationDao;
 use app\common\model\user\User;
+use app\common\model\user\UserCertification;
 use app\common\repositories\merchant\order\OrderGzcRepository;
 use app\common\repositories\merchant\order\OrderMerchantRepository;
 use app\common\repositories\store\order\StoreGroupOrderRepository;
@@ -476,6 +478,13 @@ class Auth extends BaseController
         if (!$useragree){
             $repository->createUserOperatingRecord($user->uid, 1, 1, '用户同意用户协议记录');
         }
+        // 登录增加是否实名字段
+        $userCertificationDao = new UserCertificationDao();
+        $isCertification = $userCertificationDao->getUserCertification($account);
+        $user['is_ertification'] = 0;
+        if (!empty($isCertification)) {
+            $user['is_ertification'] = 1;
+        }
         return app('json')->success($repository->returnToken($user, $tokenInfo));
     }
 

app/controller/api/user/User.php

@@ -3373,11 +3373,39 @@ 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();
-        $res = GzcApiRequest::checkAmount($userInfo);
 
-        return app('json')->success(['amount' => sprintf("%01.2f", $res['extendData']['amount'] * 0.01)]);
+        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('查询失败（第三方异常）');
+        }
+
+        // 提取 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
+        ]);
     }
 
     public function check_user_annual_fee()

app/traits/GzcApiRequest.php

@@ -56,88 +56,97 @@ 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 = [
             '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'=> 1,
+            'conCertNo'  => $user['user_card'] ?? '',
         ];
-        foreach (['conName', 'conCertNo'] as $key) {
-            if (empty($data[$key])) {
-                Log::error('[checkAmount] 参数缺失', [
-                    'missing_field' => $key,
-                    'user' => $user,
-                    'data' => $data
-                ]);
+
+        $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];
         }
-        $tokenData = self::getTokenFromServer();
-        $token = $tokenData['extendData']['accessToken'] ?? null;
-        if (empty($token)) {
-            Log::error('[checkAmount] Token 获取失败', [
-                'tokenData' => $tokenData,
-                'user' => $user
-            ]);
-        } else {
-            Log::info('[checkAmount] 成功获取 Token', ['token' => $token]);
-        }
-        Log::info('[checkAmount] 请求开始', [
-            'url' => '/v1/api/third/in/in30',
-            'data' => $data,
-            'user' => $user
-        ]);
-        $response = self::request('POST', '/v1/api/third/in/in30', $data);
-        Log::info('[checkAmount] 接口返回', [
-            'response' => $response
-        ]);
-        $code = $response['code'] ?? null;
-        $msg  = $response['msg'] ?? '';
-        $amount = $response['data']['amount'] ?? null;
-        if ($code !== 200) {
-            Log::error('[checkAmount] 接口返回异常状态码', [
-                'code' => $code,
-                'msg' => $msg,
-                'user' => $user,
-                'response' => $response
-            ]);
+    }
+    public function getAmountFromGzc()
+    {
+        $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('未找到用户实名信息');
         }
-        if (!isset($response['data']['amount'])) {
-            Log::error('[checkAmount] 响应结构异常，缺少金额字段', [
-                'user' => $user,
-                'response' => $response
-            ]);
+
+        try {
+            $res = GzcApiRequest::checkAmount($userInfo);
+        } catch (\Throwable $e) {
+            Log::error('[getAmountFromGzc] 调用异常', ['uid' => $uid, 'error' => $e->getMessage()]);
+            return app('json')->fail('查询失败（第三方异常）');
         }
-        // 情况三：金额为 0，分析可能原因
-        if ($amount === 0) {
-            $possibleReasons = [];
-            if (empty($token)) {
-                $possibleReasons[] = 'Token 获取失败或未附带';
-            }
 
-            if (empty($data['conCertNo']) || empty($data['conName'])) {
-                $possibleReasons[] = '用户姓名或身份证号为空';
-            }
+        // 提取 amount（兼容多种字段位置）
+        $amountCents = $res['extendData']['amount'] ?? $res['data']['amount'] ?? $res['amount'] ?? null;
+        $amount = $amountCents === null ? 0.0 : floatval($amountCents) * 0.01;
+        $formatted = sprintf('%.2f', $amount);
 
-            if (stripos($msg, '未开户') !== false || stripos($msg, '未实名') !== false) {
-                $possibleReasons[] = '用户未开户或未实名';
-            }
-            if (stripos($msg, '无账户') !== false) {
-                $possibleReasons[] = '第三方系统中不存在此账户';
-            }
-            if (stripos($msg, 'success') !== false && $amount === 0) {
-                $possibleReasons[] = '接口返回成功但余额确实为0（正常情况）';
-            }
-            Log::warning('[checkAmount] 返回金额为0，可能原因如下', [
-                'user' => $user,
-                'params' => $data,
-                'response' => $response,
-                'token' => $token,
-                'possible_reasons' => $possibleReasons
-            ]);
-        }
-        return $response;
-//        return self::request('POST', '/v1/api/third/in/in30', $data);
+        // 从 checkAmount 返回的 debug（若存在）
+        $debug = $res['debug'] ?? null;
+
+        // 返回 amount 与 debug 给调用方（前端 / 调试）
+        return app('json')->success([
+            'amount' => $formatted,
+            'debug'  => $debug
+        ]);
     }
     /**
      * 获取TOKEN