Merge branch 'master' into dev

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

@@ -103,9 +103,12 @@ class GzcLogs extends BaseController
         $uid = $register['data']['uid'] ?? 0;
         if(!$uid) return app('json')->fail('创建或获取用户失败');
         // 兼容港澳台用户认证
-        $age = (new DateTime())->diff(
-            DateTime::createFromFormat('Ymd', strval($birthday))
-        )->y;
+        $age = 0;
+        if($cardType != 1) {
+            $age = (new DateTime())->diff(
+                DateTime::createFromFormat('Ymd', strval($birthday))
+            )->y;
+        }
         $certification = $OrderGzcRepository->certification($uid, $mobile, $user_name, $user_card, $card_positive, $card_reverse,$cardType,$birthday,$gender,$age);
         Log::info('pcpc认证结果' . json_encode($certification));
         if($certification['status'] != 200) return app('json')->fail('实名认证失败:'.$certification['message']);
@@ -191,9 +194,12 @@ class GzcLogs extends BaseController
             $uid = $register['data']['uid'] ?? 0;
             if(!$uid) return app('json')->fail('创建或获取用户失败');
             // 兼容港澳台用户认证
-            $age = (new DateTime())->diff(
-                DateTime::createFromFormat('Ymd', strval($birthday))
-            )->y;
+            $age = 0;
+            if($cardType != 1) {
+                $age = (new DateTime())->diff(
+                    DateTime::createFromFormat('Ymd', strval($birthday))
+                )->y;
+            }
             $certification = $OrderGzcRepository->certification($uid, $mobile, $user_name, $user_card, $card_positive, $card_reverse,$cardType,$birthday,$gender,$age);
             if($certification['status'] != 200) return app('json')->fail('实名认证失败:'.$certification['message']);
             $gzc = $OrderGzcRepository->gzc($uid,$log['pension']);