Merge remote-tracking branch 'origin/master'

app/controller/api/user/User.php

@@ -927,6 +927,7 @@ class User extends BaseController
     {
         $member_id = $this->request->uid();
         $type = input("type", 0);
+        $cardType = input('card_type',1);
         if ($type == 1) {
             $data = $this->repository->get_cer(["uid" => $member_id]);
             return app('json')->success($data);
@@ -942,19 +943,44 @@ class User extends BaseController
         $params['create_time'] = time();
         $params['uid'] = $member_id;
         $baidu = new Ocr();
-        $image = file_get_contents($params['card_positive']);
-        $idCardSide = "front";
-        $result = $baidu->idcard($image, $idCardSide);
-        $real_user_name = $result['words_result']['姓名']['words'] ?? '';
-        $real_user_card = $result['words_result']['公民身份号码']['words'] ?? '';
-        if ($real_user_name != $params['user_name']) {
-            return app('json')->fail('姓名或身份证号输入有误~');
-        }
-        if ($real_user_card != $params['user_card']) {
-            return app('json')->fail('姓名或身份证号输入有误~');
-        }
-        if ($result['image_status'] == "normal" && $result['idcard_number_type'] == 1) {
+        // 兼容港澳台证件
+        if ($cardType != 1) {
+            // 设置exitentrypermit_type
+            $exType = '';
+            if ($cardType == 2) {
+                $exType = 'tw_return_passport_front'; //台胞证
+            }
+            if ($cardType == 3) {
+                $exType = 'hk_mc_return_passport_front'; // 返乡证
+            }
+
+            if (empty($exType)) {
+                return app('json')->fail('证件号类型错误~');
+            }
+
+            $postData['url'] = $params['card_positive'];
+            $postData['exitentrypermit_type'] = $exType;
+            $result = $baidu->hkMacauTaiwan($postData);
+            $real_user_name = $result['words_result']['name_chn'][0]['word']??'';
+            $real_user_card = $result['words_result']['card_number'][0]['word']??'';
+            if ($real_user_name != $params['user_name']) {
+                return app('json')->fail('姓名或身份证号输入有误~');
+            }
+            if ($real_user_card != $params['user_card']) {
+                return app('json')->fail('姓名或身份证号输入有误~');
+            }
+
+            $params['reason'] = '';
+            $params['audit_time'] = 0;
+            $params['update_time'] = 0;
             $params['status'] = 1;
+            $params['card_type'] = $cardType;
+            if ($result['words_result']['sex'][0]['word'] == '男') {
+                $gender = 1;
+            }else{
+                $gender = 2;
+            }
+            $params['gender'] = $gender;
             $res = $this->repository->add_cer($params, $member_id);
             if ($res) {
                 $userRepository = app()->make(UserRepository::class);
@@ -973,8 +999,41 @@ class User extends BaseController
             } else {
                 return app('json')->fail('认证失败');
             }
-        } else {
-            return app('json')->fail('认证失败，请重新认证');
+        }else{
+            $image = file_get_contents($params['card_positive']);
+            $idCardSide = "front";
+            $result = $baidu->idcard($image, $idCardSide);
+            $real_user_name = $result['words_result']['姓名']['words'] ?? '';
+            $real_user_card = $result['words_result']['公民身份号码']['words'] ?? '';
+            if ($real_user_name != $params['user_name']) {
+                return app('json')->fail('姓名或身份证号输入有误~');
+            }
+            if ($real_user_card != $params['user_card']) {
+                return app('json')->fail('姓名或身份证号输入有误~');
+            }
+            if ($result['image_status'] == "normal" && $result['idcard_number_type'] == 1) {
+                $params['status'] = 1;
+                $res = $this->repository->add_cer($params, $member_id);
+                if ($res) {
+                    $userRepository = app()->make(UserRepository::class);
+                    // 赠送积分 完善实名送90个积分，同时送邀请人50个积分
+                    $userRepository->sign_add($member_id, 90,1,'完善实名系统赠送90个积分','','', '', 1, '', 1);
+                    $member_info = Db::name('user')->where( array('uid' => $member_id) )->find();
+                    Db::name('user')
+                        ->where('uid', $member_id)
+                        ->update(['real_name' => $params['user_name'], 'nickname' => $params['user_name']]);
+                    if($member_info['spread_uid']){
+                        // 好友完善实名系统赠送50个积分
+                        $spreadUid = $member_info['spread_uid'];
+                        $userRepository->sign_add($spreadUid, 50,1,'好友完善实名系统赠送50个积分','','', '', 1, '', 1);
+                    }
+                    return app('json')->success($res);
+                } else {
+                    return app('json')->fail('认证失败');
+                }
+            } else {
+                return app('json')->fail('认证失败，请重新认证');
+            }
         }
 
     }