Merge branch 'master' into stabble

app/Http/Controllers/Wap/User/CoflController.php

@@ -160,6 +160,43 @@ class CoflController extends Controller
     }
 
 
+    public function freeCurrencyViewOther(Request $request){
+        $openid = $request->get('openid');
+        //授权
+        $params = $request->except('_url');
+        if(empty($openid)){
+            $url = url()->current() . '?' . http_build_query($params);
+            $params['redirect_url'] = urlencode($url);
+            $app = new Application($this->auth($params));
+            return $app->oauth->redirect();
+        }
+        $token = $request->get('token');
+        $fee = 0;
+        if($token){
+            $info = DB::table('crm_free_currency_token')->where('token',$token)->where('is_enable',1)->first();
+            if($info) $fee = $info->amount;
+        }
+        $user = $this->getUsersV2($openid);
+        if(!$user || !$user[0] || !$user[1] || !$fee) return redirect()->to($this->getLink().'?'.http_build_query($params));
+        $crm = 'reward';
+        $source = $request->get('wx','none');
+        $type = 'CRM_'.$fee;
+        $this->stats('reward_'.$fee,$crm);
+
+        $this->statsDetail($user[0],'reward_'.$fee,0);
+
+        $get_free_currency = UserBindHkWelfareService::isHasGet($user[0]);
+        if($get_free_currency){
+            //已经领过
+            $link = $this->getLink($get_free_currency->distribution_channel_id).'recent?'.http_build_query($params);
+            return view('jump.bindHkFreeCurrency',['fee'=>$fee,'url'=>$link,'is_get'=>1,'uid'=>$get_free_currency->uid,'source'=>$source]);
+        }else{
+            $link = $this->getLink($user[1]).'recent?'.http_build_query($params);
+            $this->getReward($user[0],$fee,$source,$type);
+            return view('jump.bindHkFreeCurrency',['fee'=>$fee,'url'=>$link,'is_get'=>0,'uid'=>$user[0],'source'=>$source]);
+        }
+    }
+
     private function freeCurrencyFee($token,$fee){
         if(!$token || !$fee) return 200;
         $param['fee'] = $fee;

app/Http/Routes/Wap/WapRoutes.php

@@ -79,9 +79,13 @@ Route::group(['domain'=>env('FRIEND_LINK_DOMAIN'),'namespace'=>'App\Http\Control
     Route::get('wfreecurrency','User\CoflController@freeCurrencyView');
     Route::get('freethrhcurrency','User\CoflController@freeCurrencyView');
     Route::get('frocefreethrhcurrency','User\CoflController@freeCurrencyView');
+
+    Route::get('customfcl','User\CoflController@freeCurrencyViewOther');
+
     Route::post('freecurrency','User\CoflController@freeCurrencyPost');
     Route::get('activity','User\CoflController@longActivity');
     Route::get('activity/year','User\CoflController@yearActivity');
+
 });
 
 Route::group(['domain'=>env('WAP_DOMAIN'),'namespace'=>'App\Http\Controllers\Wap','middleware'=>'EnableCross'],function(){