Merge branch 'master' into dev

# Conflicts:
#	app/common/repositories/merchant/order/OrderGzcRepository.php
#	app/common/repositories/store/order/StoreOrderRepository.php
#	app/controller/admin/system/merchant/GzcLogs.php

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

@@ -330,8 +330,7 @@ class OrderGzcRepository extends BaseRepository
         $curl = curl_init();
 
         curl_setopt_array($curl, [
-            // CURLOPT_URL            => "http://pcpc.bjtdba.com/api/third/register", // 生产环境
-            CURLOPT_URL            => "http://testpcpc.bjtdba.com/api/third/register", // 测试环境
+            CURLOPT_URL            => "http://pcpc.bjtdba.com/api/third/register",
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_ENCODING       => "",
             CURLOPT_MAXREDIRS      => 10,
@@ -394,7 +393,6 @@ class OrderGzcRepository extends BaseRepository
             ];
         }
 
-
         ksort($data);
         $params = '';
         foreach ($data as $key => $value) {
@@ -405,8 +403,7 @@ class OrderGzcRepository extends BaseRepository
         $curl = curl_init();
 
         curl_setopt_array($curl, [
-            // CURLOPT_URL            => "http://pcpc.bjtdba.com/api/third/certification", // 生产
-            CURLOPT_URL            => "https://testpcpc.bjtdba.com/api/third/certification", // 测试
+            CURLOPT_URL            => "http://pcpc.bjtdba.com/api/third/certification",
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_ENCODING       => "",
             CURLOPT_MAXREDIRS      => 10,
@@ -453,8 +450,7 @@ class OrderGzcRepository extends BaseRepository
         $curl = curl_init();
 
         curl_setopt_array($curl, [
-            // CURLOPT_URL            => "http://pcpc.bjtdba.com/api/third/gzc", // 生产
-            CURLOPT_URL            => "http://testpcpc.bjtdba.com/api/third/gzc", // 测试
+            CURLOPT_URL            => "http://pcpc.bjtdba.com/api/third/gzc",
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_ENCODING       => "",
             CURLOPT_MAXREDIRS      => 10,

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

@@ -71,7 +71,7 @@ class GzcLogs extends BaseController
      * created: 2021/3/24 13:56
      */
     public function inGzc()
-    { 
+    {
         $id = intval($this->request->param('id'));
         $log = Db::table('rrx_gzc_logs')
             ->where('id', $id)
@@ -79,11 +79,11 @@ class GzcLogs extends BaseController
             ->where('success', 0)
             ->where('pension', '>', 0)
             ->find();
-        
+
         if(!$log){
-            return app('json')->fail('请选择未入账的记录', );
+            return app('json')->fail('请选择未入账的记录');
         }
-            
+
         $mobile= $log['mobile'];
         $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');
@@ -116,18 +116,18 @@ class GzcLogs extends BaseController
         $OrderMerchantRepository = app()->make(OrderMerchantRepository::class);
         $orderId = $OrderMerchantRepository->getNewOrderId('IN10');
         Db::table('rrx_gzc_logs')
-        ->where('id', $id)
-        ->where('gzc', 0)
-        ->where('success', 0)
-        ->where('pension', '>', 0)
-        ->update([
-            'gzc' => 1,
-            'platform_no' => $orderId,
-            'gzc_deposit_no' => $gzc_deposit_no,
-            'gzc_confirm_result' => $gzc_confirm_result,
-            'success' => 1,
-            'update_time' => date('Y-m-d H:i:s')
-        ]);
+            ->where('id', $id)
+            ->where('gzc', 0)
+            ->where('success', 0)
+            ->where('pension', '>', 0)
+            ->update([
+                'gzc' => 1,
+                'platform_no' => $orderId,
+                'gzc_deposit_no' => $gzc_deposit_no,
+                'gzc_confirm_result' => $gzc_confirm_result,
+                'success' => 1,
+                'update_time' => date('Y-m-d H:i:s')
+            ]);
 
         //发起成功更新记录值
         $order_id = Db::name('store_order')->where('order_sn', $log['out_trade_no'])->value('order_id');
@@ -135,13 +135,13 @@ class GzcLogs extends BaseController
             $bill = Db::name('user_bill')->where('link_id', $order_id)->where('commission_type', 5)->where('is_gzc', 'in', [0, 1])->find();
             if($bill){
                 Db::name('user_bill')
-                ->where('bill_id', $bill['bill_id'])
-                ->update([
-                    'is_gzc' => 2
-                ]);
+                    ->where('bill_id', $bill['bill_id'])
+                    ->update([
+                        'is_gzc' => 2
+                    ]);
             }
         }
-        
+
         return app('json')->success('发起成功', $log);
     }
 
@@ -195,7 +195,6 @@ class GzcLogs extends BaseController
                 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']);
             $gzc = $OrderGzcRepository->gzc($uid,$log['pension']);
             if($gzc['status'] != 200) return app('json')->fail('入账失败:'.$gzc['message']);

app/controller/api/Auth.php

@@ -1425,7 +1425,7 @@ class Auth extends BaseController
         }
 
         if ($data['type']=="register"){
-            $count=Db::name("user")->where("phone", $data["phone"])->count();
+            $count=Db::name("user")->where("phone", $data["phone"])->where('is_del','=',0)->count();
             if ($count){
                 return app('json')->make(405, '该手机号已注册,请直接登录');
             }
@@ -1441,6 +1441,8 @@ class Auth extends BaseController
         $sms_key = 'api.auth.sms.' . $data['phone'];
         $sms_code = str_pad(random_int(1, 9999), 4, 0, STR_PAD_LEFT);
         $sms_time = systemConfig('sms_time') ? systemConfig('sms_time') : 30 ;
+        // 兼容香港手机号
+        if (strlen($data['phone']) != 11) $data['phone'] = '+852' . $data['phone'];
         $res = app()->make(AliYunSmsService::class)->send($data['phone'],  $sms_code);
         if($res['Code']!='OK'){
             Db::name('log')->insert(['data'=>'幸福保短信发送失败：'.json_encode($res,256)]);
@@ -2094,12 +2096,13 @@ class Auth extends BaseController
                 return app('json')->fail('没有获取到手机号1');
             }
 //            dump($data);
+            Db::name('log')->insert(['data'=>'一键登录获取的数据：' .$data]);
             $data=json_decode($data,true);
             $phone=$data['purePhoneNumber']??'';
             if($phone==''){
                 return app('json')->fail('没有获取到手机号2');
             }
-            if (!preg_match("/^1[3456789]{1}\d{9}$/", $phone)){
+            if (!preg_match("/^1[3456789]{1}\d{9}$/", $phone) && !preg_match("/^[569]\d{7}$/",$phone)){
                 return app('json')->fail('手机号格式错误');
             }
             $user_res=Db::name('user')->where('account',$phone)->find();

app/controller/api/store/merchant/Taskorderguquan.php

@@ -19,69 +19,49 @@ class Taskorderguquan
 
         /**
         补贴下面人员
-        13231658486周行体600
-        13333069689魏   新600
-        13959100621周金花300
-        13701061395李素红300
-        17501006833邢艳丽300
-        15631982690魏震洪200
-        18603401312黄金花200
-        13521438652徐立苹300
-        15832971815孟晓玮300
-        18600200909陈冠霖300
-        15810064711 王   玲 300
-        13932925303会强200
-        13901074090陈玉刚300
-        13381085923王建军50
-        13601071082隋彩云200
-        18001316701闫旭200
-        13601179856陈瑞元50
-        13161909228刘银霞50
-        18760167163刘春梅50
-        13215917919李小秋50
-        13801358713金波50
-        15321221558李伟 200
-        15332507711张传莲50
-        15960349667吕丽娣50
-        13231658486周军市场补贴600
-        18513005403王培50
-        18612051372李金俭 50
-        15803242611王志敏50
-        13701059062王金权50
-        13331043787张吉良115
-        18715313601大饼300
-        */
+        13231658486周行体200
+        13333069689魏   新200
+        13959100621周金花100
+        13701061395李素红50
+        17501006833邢艳丽100
+        15631982690魏震洪50
+        18603401312黄金花50
+        13521438652徐立苹50
+        15832971815孟晓玮50
+        18600200909陈冠霖100
+        15810064711 王   玲 100
+        13932925303会强50
+        13601071082隋彩云100
+        18001316701闫旭100
+        13601179856陈瑞元20
+        13161909228刘银霞20
+        18760167163刘春梅20
+        13215917919李小秋20
+        13231658486周军市场补贴200
+        13331043787张吉良55
+        18715313601大饼100
+         */
         $data = [
-            '13231658486' => 1200,
-            '13333069689' => 600,
-            '13959100621' => 300,
-            '13701061395' => 300,
-            '17501006833' => 300,
-            '15631982690' => 200,
-            '18603401312' => 200,
-            '13521438652' => 300,
-            '15832971815' => 300,
-            '18600200909' => 300,
-            '15810064711' => 300,
-            '13932925303' => 200,
-            '13901074090' => 300,
-            '13381085923' => 50,
-            '13601071082' => 200,
-            '18001316701' => 200,
-            '13601179856' => 50,
-            '13161909228' => 50,
-            '18760167163' => 50,
-            '13215917919' => 50,
-            '13801358713' => 50,
-            '15321221558' => 200,
-            '15332507711' => 50,
-            '15960349667' => 50,
-            '18513005403' => 50,
-            '18612051372' => 50,
-            '15803242611' => 50,
-            '13701059062' => 50,
-            '13331043787' => 115,
-            '18715313601' => 300
+            '13231658486' => 400,
+            '13333069689' => 200,
+            '13959100621' => 100,
+            '13701061395' => 50,
+            '17501006833' => 100,
+            '15631982690' => 50,
+            '18603401312' => 50,
+            '13521438652' => 50,
+            '15832971815' => 50,
+            '18600200909' => 100,
+            '15810064711' => 100,
+            '13932925303' => 50,
+            '13601071082' => 100,
+            '18001316701' => 100,
+            '13601179856' => 20,
+            '13161909228' => 20,
+            '18760167163' => 20,
+            '13215917919' => 20,
+            '13331043787' => 55,
+            '18715313601' => 100
         ];
 
         $result = Db::name("user")