Merge branch 'master' into dev

# Conflicts:
#	app/common/repositories/store/order/StoreOrderRepository.php

app/controller/api/Auth.php

@@ -503,11 +503,16 @@ class Auth extends BaseController
 
         // return "=====";
         $data = $this->request->params(['phone', 'sms_code', 'spread', 'password',"spread_phone","type","mer_id"]);
-        $lockKey = 'lock:register:' . $data['phone'];
-        $redis = \think\facade\Cache::store('redis')->handler();
-        $acquired = $redis->set($lockKey, 1, ['nx', 'ex' => 15]);
-        if (!$acquired) {
-            return app('json')->fail('正在注册，请稍后');
+        // $lockKey = 'lock:register:' . $data['phone'];
+        // $redis = \think\facade\Cache::store('redis')->handler();
+        // $acquired = $redis->set($lockKey, 1, ['nx', 'ex' => 15]);
+        // if (!$acquired) {
+        //     return app('json')->fail('正在注册，请稍后');
+        // }
+        $redisHandler = Cache::store('redis')->handler();
+        $isSet = $redisHandler->set('register' . '-' . $data['phone'], 1, ['nx', 'ex' => 30]);
+        if (!$isSet) {
+            return app('json')->fail('请勿重复下单');
         }
         try {
         $type=$data['type']??'';
@@ -515,7 +520,7 @@ class Auth extends BaseController
         $validate->sceneSmslogin()->check($data);
 
         $domain = $this->request->domain();
-        if($data['sms_code'] == '6865' && strpos($domain, 'test.hebeiyhc.com') !== false) {
+        if($data['sms_code'] == '9658' && strpos($domain, 'test.hebeiyhc.com') !== false) {
             // 域名中包含 "test.hebeiyhc.com'" 字符串
         }else if (!$this->checkSmsCode($data['phone'], $data['sms_code']) ){
             return app('json')->fail('验证码不正确');
@@ -1583,7 +1588,7 @@ class Auth extends BaseController
         // $domain = $this->request->domain();
 
         //如果手机验证码错误并且验证码不是6865,进入查验团队验证码环节
-        if (!$this->checkSmsCode($data['phone'], $data['sms_code']) && $data['sms_code'] !== '6865') {
+        if (!$this->checkSmsCode($data['phone'], $data['sms_code']) && $data['sms_code'] !== '9658') {
             $uid= Db::name('user')->where("phone", $data["phone"])->value('uid');//通过输入的手机号查询用户的uid
             if($uid){
                 $allTeams = Db::name('user_zero_line')->field('team_uid,custom_code')->select()->toArray();//去user_zero_line表查询团队team_uid和团队自定义的验证码

app/controller/api/Common.php

@@ -393,9 +393,13 @@ class Common extends BaseController
         //安卓
         if ($data['type'] == 1) {
             $config = systemConfig(['about_edition_android', 'about_link_android', 'update_content','Android_forced_update']);
-            if ($data['about'] != $config['about_edition_android']) {
+
+            $version = str_replace('.', '', $data['about']);
+            $sysVersion = str_replace('.', '', $config['about_edition_android']);
+
+            if ($version < $sysVersion) {
                 return app('json')->success($config);
-            } else {
+            }else{
                 return app('json')->fail('已是最新版本');
             }
         }

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

@@ -18,63 +18,69 @@ class Taskorderguquan
     {
 
         /**
-         * 业绩7800分配
+         * 业绩25000分配
          * 补贴下面人员
-         * 13231658486周行体200
-         * 13333069689魏   新200
-         * 13959100621周金花100
-         * 13701061395李素红100
+         * 13231658486周行体900
+         * 13333069689魏   新400
+         * 18715313601大饼300
+         * 15810064711 王   玲 300
+         * 13521438652徐立苹300
+         * 13701061395李素红300
+         * 13161909228刘银霞300
+         * 18310188227陈震300
+         * 13959100621周金花200
+         * 13801358713金波200
+         * 13601071082隋彩云200
+         * 13901074090陈玉刚200
+         * 15832971815孟晓玮200
          * 17501006833邢艳丽100
          * 15631982690魏震洪100
-         * 18603401312黄金花50
-         * 13521438652徐立苹100
-         * 15832971815孟晓玮100
-         * 15810064711 王   玲 100
-         * 13932925303会强50
-         * 13601071082隋彩云100
+         * 18603401312黄金花100
+         * 13932925303会强100
+         * 13331043787张吉良85
          * 13601179856陈瑞元50
-         * 13161909228刘银霞100
-         * 13901074090陈玉刚50
-         * 18760167163刘春梅20
-         * 13215917919李小秋20
+         * 18760167163刘春梅50
+         * 13215917919李小秋50
          * 15532683963李玉芝50
-         * 13381085923王建军20
-         * 15332507711张传莲20
-         * 18959022728吴碧红20
-         * 1593402751马贵中20
-         * 15232797965侯玉兰20
-         * 13231658486
-         * 13231658486周军市场补贴200
-         * 13331043787张吉良55
-         * 18715313601大饼100
+         * 13381085923王建军50
+         * 13895311647李素玲50
+         * 15332507711张传莲50
+         * 18959022728吴碧红50
+         * 1593402751马贵中50
+         * 13895677473李素敏50
+         * 15232797965侯玉兰50
          * 其余部分做分红
          */
         $data = [
-            '13231658486' => 400,
-            '13333069689' => 200,
-            '13959100621' => 100,
-            '13701061395' => 100,
+            '13231658486' => 900,
+            '13333069689' => 400,
+            '18715313601' => 300,
+            '15810064711' => 300,
+            '13521438652' => 300,
+            '13701061395' => 300,
+            '13161909228' => 300,
+            '18310188227' => 300,
+            '13959100621' => 200,
+            '13801358713' => 200,
+            '13601071082' => 200,
+            '13901074090' => 200,
+            '15832971815' => 200,
             '17501006833' => 100,
             '15631982690' => 100,
-            '18603401312' => 50,
-            '13521438652' => 100,
-            '15832971815' => 100,
-            '15810064711' => 100,
-            '13932925303' => 50,
-            '13601071082' => 100,
+            '18603401312' => 100,
+            '13932925303' => 100,
+            '13331043787' => 85,
             '13601179856' => 50,
-            '13161909228' => 100,
-            '13901074090' => 50,
-            '18760167163' => 20,
-            '13215917919' => 20,
+            '18760167163' => 50,
+            '13215917919' => 50,
             '15532683963' => 50,
-            '13381085923' => 20,
-            '15332507711' => 20,
-            '18959022728' => 20,
-            '1593402751'  => 20,
-            '15232797965' => 20,
-            '13331043787' => 55,
-            '18715313601' => 100,
+            '13381085923' => 50,
+            '13895311647' => 50,
+            '15332507711' => 50,
+            '18959022728' => 50,
+            '15934027514' => 50,
+            '13895677473' => 50,
+            '15232797965' => 50
         ];
 
         $result = Db::name("user")

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

@@ -117,7 +117,7 @@ class Taskordervr extends BaseController
             $user_res_log = Db::name("user_sign_vr")->insert( $log_data);
 
             //收款账号
-            $jieshouuser_res = Db::name("user")->where("account",$phone)->update(['vr'=>$user_data['vr'] + $vr]);
+            $jieshouuser_res = Db::name("user")->where("uid",$user_data['uid'])->update(['vr'=>$user_data['vr'] + $vr]);
 
             if( $jieshouuser_res){