Merge branch 'stabble'

app/Http/Controllers/Wap/Order/OrdersController.php

@@ -793,35 +793,35 @@ class OrdersController extends BaseController
 
     private function outstandingYearOrder($uid)
     {
-        if (!in_array($this->distribution_channel_id, explode(',', env('OUTSTANDING_YEAR_ORDER_SITE')))) {
+        /*if (!in_array($this->distribution_channel_id, explode(',', env('OUTSTANDING_YEAR_ORDER_SITE')))) {
             return false;
-        }
+        }*/
 
         //$userDivisionProperty = UserDivisionPropertyService::getUserProperty($uid);
         $userDivisionProperty = UserDivisionCpcPropertyService::getUserProperty($uid);
         if (!$userDivisionProperty) return false;
 
-        if ($userDivisionProperty != 'high') return false;
+        //if ($userDivisionProperty != 'high') return false;
 
-        if ($uid % 2 == 0) {
+        /*if ($uid % 2 == 0) {
             $is_show_outstanding_year_order = true;
             $template_id = 1;
         } else {
             $is_show_outstanding_year_order = false;
             $template_id = 2;
-        }
+        }*/
 
         $exist = DataAnalysisSelectUserService::getByUidAndType($uid, 'OUTSTANDING_YEAR_ORDER_V2');
-        if($exist) return  $is_show_outstanding_year_order;
-
+        if($exist) return  true;
 
+        return false;
 
-        DataAnalysisSelectUserService::create(
+        /*DataAnalysisSelectUserService::create(
             $uid,
             $this->distribution_channel_id,
             'OUTSTANDING_YEAR_ORDER_V2',
             -1, $template_id);
-        return $is_show_outstanding_year_order;
+        return $is_show_outstanding_year_order;*/
     }
 
     public function exchangeList(){

app/Http/Controllers/Wap/Web/WelcomeController.php

@@ -276,14 +276,14 @@ class WelcomeController extends BaseController
 
     private function outstandingYearOrder(){
         $outstanding_year_order = false;
-        if( in_array($this->distribution_channel_id,explode(',',env('OUTSTANDING_YEAR_ORDER_SITE'))) ){
-            if($this->uid%2 == 0){
+        //if( in_array($this->distribution_channel_id,explode(',',env('OUTSTANDING_YEAR_ORDER_SITE'))) ){
+            //if($this->uid%2 == 0){
                 //$userDivisionProperty = UserDivisionPropertyService::getUserProperty($this->uid);
                 $userDivisionProperty = UserDivisionCpcPropertyService::getUserProperty($this->uid);
-                \Log::info('$userDivisionProperty is :'.$userDivisionProperty);
+
                 $userDivisionProperty && $userDivisionProperty == 'high' && $outstanding_year_order = true;
-            }
-        }
+            //}
+        //}
         return $outstanding_year_order;
     }
     private function luckyUserForeverFree()