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

app/common/enum/store/StoreOrderEnum.php

@@ -40,6 +40,7 @@ class StoreOrderEnum extends CommonEnum
         'B3-VR+Jingdou' => ['code' => 'b3', 'name' => 'VR+京豆'],
         'B4-Cash+Jingdou' => ['code' => 'b4', 'name' => '现金+京豆'],
         'B5-VR' => ['code' => 'b5', 'name' => 'VR'],
+        'B6-Cash' => ['code' => 'b6', 'name' => '现金'],
         'A1-VR' => ['code' => 'a1', 'name' => 'VR'],
         'A2-Cash' => ['code' => 'a2', 'name' => '现金'],
         'A3-Cash+VR' => ['code' => 'a3', 'name' => '现金+VR'],

app/common/repositories/store/order/StoreOrderRepository.php

@@ -10878,6 +10878,8 @@ class StoreOrderRepository extends BaseRepository
             // 执行 Vr 增减 操作
             $userSignVrRepository->execute($userSignVrEntity->getId());
             $paySuccess = true;
+        } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B6-Cash']['code']) {
+
         } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['A1-VR']['code']) {
             if ($fzonePayTypeEntity->getPrice() > $userEntity->getVr()) {
                 throw new ValidateException('支付失败，VR不足！');

app/controller/api/user/User.php

@@ -955,7 +955,6 @@ class User extends BaseController
         $params['create_time'] = time();
         $params['uid'] = $member_id;
         $baidu = new Ocr();
-
         // 兼容港澳台证件
         if ($cardType != 1) {
             // 设置exitentrypermit_type
@@ -983,6 +982,7 @@ class User extends BaseController
             if ($real_user_card != $params['user_card']) {
                 return app('json')->fail('姓名或身份证号输入有误~');
             }
+
             $params['reason'] = '';
             $params['audit_time'] = 0;
             $params['update_time'] = 0;
@@ -1018,6 +1018,7 @@ class User extends BaseController
             $image = file_get_contents($params['card_positive']);
             $idCardSide = "front";
             $result = $baidu->idcard($image, $idCardSide);
+            Log::info('hkMacauTaiwan:' . json_encode($result));
             $real_user_name = $result['words_result']['姓名']['words'] ?? '';
             $real_user_card = $result['words_result']['公民身份号码']['words'] ?? '';
             if ($real_user_name != $params['user_name']) {
@@ -1028,6 +1029,7 @@ class User extends BaseController
             }
             if ($result['image_status'] == "normal" && $result['idcard_number_type'] == 1) {
                 $params['status'] = 1;
+                $params['card_type'] = $cardType;
                 $res = $this->repository->add_cer($params, $member_id);
                 if ($res) {
                     $userRepository = app()->make(UserRepository::class);
@@ -1050,6 +1052,7 @@ class User extends BaseController
                 return app('json')->fail('认证失败，请重新认证');
             }
         }
+
     }