Browse Source

Merge branch 'stabble'

zz 5 years ago
parent
commit
4e37e3050d

File diff suppressed because it is too large
+ 2 - 2
app/Http/Controllers/Wap/Pay/OrdersController.php


+ 8 - 0
app/Http/Controllers/Wap/User/CoflController.php

@@ -600,7 +600,10 @@ class CoflController extends Controller
             return $app->oauth->redirect();
         }
         list($uid,$distribution_channel_id) = $this->getUsersV2($openid);
+
         $link = $this->getLink($distribution_channel_id);
+        $get_info = UserBindHkWelfareService::isHasGet($uid);
+        if($get_info)   redirect()->to($link);
         $crm = $request->get('crm','guide_personal');
         $params['crm'] = $crm;
         $params['uid'] = $uid;
@@ -616,6 +619,8 @@ class CoflController extends Controller
         //$uid = $user_cookie ? decrypt($user_cookie) : null;
         $cookie_crm_img = Cookie::get('crm_person_img');
         $cookie_crm_name = Cookie::get('crm_person_name','');
+        $get_info = UserBindHkWelfareService::isHasGet($uid);
+        if($get_info)   return back();
         if($cookie_crm_img){
             return view('jump.guidePersonalAccountOurs',['img'=>$cookie_crm_img,'name'=>$cookie_crm_name]);
         }
@@ -630,6 +635,9 @@ class CoflController extends Controller
         $now_id = (int)$env_config[2];
         $uv = Redis::scard('active_guide_personal_uv');
         $personal_info = DB::table('personal_account_list')->where('id',$now_id)->select('count')->first();
+        if(!$personal_info){
+            return back();
+        }
         $total_max = (int)($personal_info->count+$uv);
         //Log::info('$total_max is: '.);
         if($uv >= $one_loop_max || $total_max>=$max){