Merge branch 'shichen0929' of shop/php into dev

app/common/repositories/merchant/order/OrderGzcRepository.php

@@ -356,20 +356,42 @@ class OrderGzcRepository extends BaseRepository
 
 
 
-    public function certification($uid, $mobile, $user_name, $user_card, $card_positive, $card_reverse)
+    public function certification($uid, $mobile, $user_name, $user_card, $card_positive, $card_reverse,$cardType,$birthday,$gender)
     {
         $thirdKey = "xingfubao";
         $thirdsignKey = "xfb@86868.";
         $time = time();
 
-        $data = [
-            'uid'  => $uid,
-            'mobile' => $mobile,
-            'user_name' => $user_name,
-            'user_card' => $user_card,
-            'card_positive'=> $card_positive,
-            'card_reverse'=> $card_reverse,
-        ];
+        if ($cardType == 1) {
+            $data = [
+                'uid'  => $uid,
+                'mobile' => $mobile,
+                'user_name' => $user_name,
+                'user_card' => $user_card,
+                'card_positive'=> $card_positive,
+                'card_reverse'=> $card_reverse,
+            ];
+        }else{
+            $concertType = 0;
+            if ($cardType == 2) {
+                $concertType = 10;
+            }
+            if ($cardType == 3) {
+                $concertType = 11;
+            }
+            $data = [
+                'uid'  => $uid,
+                'mobile' => $mobile,
+                'user_name' => $user_name,
+                'user_card' => $user_card,
+                'card_positive'=> $card_positive,
+                'card_reverse'=> $card_reverse,
+                'concertType' => $concertType,
+                'birthday' => $birthday,
+                'conSex' => $gender
+            ];
+        }
+
 
         ksort($data);
         $params = '';

app/controller/admin/system/merchant/GzcLogs.php

@@ -166,7 +166,10 @@ class GzcLogs extends BaseController
             $user_name =  Db::name('user_certification')->where('uid',$log['uid'])->value('user_name');
             $user_card =  Db::name('user_certification')->where('uid',$log['uid'])->value('user_card');
             $card_positive = Db::name('user_certification')->where('uid',$log['uid'])->value('card_positive');
-            $card_reverse = Db::name('user_certification')->where('uid',$log['uid'])->value('card_reverse');
+            $cardType = Db::name('user_certification')->where('uid',$log['uid'])->value('card_reverse');
+            $birthday = Db::name('user_certification')->where('uid',$log['uid'])->value('card_type');
+            $gender = Db::name('user_certification')->where('uid',$log['uid'])->value('gender');
+            $card_reverse = Db::name('user_certification')->where('uid',$log['uid'])->value('birthday');
             if(!$mobile || !$user_name || !$user_card || !$card_positive || !$card_reverse){
                 return app('json')->fail('存在实名数据缺失');
             }
@@ -177,7 +180,8 @@ class GzcLogs extends BaseController
             if($register['status'] != 200) return app('json')->fail('入账失败:'.$register['message']);
             $uid = $register['data']['uid'] ?? 0;
             if(!$uid) return app('json')->fail('创建或获取用户失败');
-            $certification = $OrderGzcRepository->certification($uid, $mobile, $user_name, $user_card, $card_positive, $card_reverse);
+            // 兼容港澳台用户认证
+            $certification = $OrderGzcRepository->certification($uid, $mobile, $user_name, $user_card, $card_positive, $card_reverse,$cardType,$birthday,$gender);
             if($certification['status'] != 200) return app('json')->fail('实名认证失败:'.$certification['message']);
             $gzc = $OrderGzcRepository->gzc($uid,$log['pension']);
             if($gzc['status'] != 200) return app('json')->fail('入账失败:'.$gzc['message']);