outstanding new

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

@@ -12,6 +12,7 @@ use App\Modules\OfficialAccount\Services\ForceSubscribeService;
 use App\Modules\Statistic\Services\AdVisitStatService;
 use App\Modules\Statistic\Services\DataAnalysisSelectUserService;
 use App\Modules\User\Services\ForceSubscribeUserIService;
+use App\Modules\User\Services\UserDivisionCpcPropertyService;
 use App\Modules\User\Services\UserDivisionPropertyService;
 use App\Modules\User\Services\UserService;
 use App\Modules\Book\Services\BookService;
@@ -796,7 +797,8 @@ class OrdersController extends BaseController
             return false;
         }
 
-        $userDivisionProperty = UserDivisionPropertyService::getUserProperty($uid);
+        //$userDivisionProperty = UserDivisionPropertyService::getUserProperty($uid);
+        $userDivisionProperty = UserDivisionCpcPropertyService::getUserProperty($uid);
         if (!$userDivisionProperty) return false;
 
         if ($userDivisionProperty != 'high') return false;
@@ -809,7 +811,7 @@ class OrdersController extends BaseController
             $template_id = 2;
         }
 
-        $exist = DataAnalysisSelectUserService::getByUidAndType($uid, 'OUTSTANDING_YEAR_ORDER');
+        $exist = DataAnalysisSelectUserService::getByUidAndType($uid, 'OUTSTANDING_YEAR_ORDER_V2');
         if($exist) return  $is_show_outstanding_year_order;
 
 
@@ -817,7 +819,7 @@ class OrdersController extends BaseController
         DataAnalysisSelectUserService::create(
             $uid,
             $this->distribution_channel_id,
-            'OUTSTANDING_YEAR_ORDER',
+            'OUTSTANDING_YEAR_ORDER_V2',
             -1, $template_id);
         return $is_show_outstanding_year_order;
     }

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

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers\Wap\Web;
 
-use App\Admin\Models\Product;
 use App\Jobs\SendStatisticsList;
 use App\Jobs\SendTexts;
 use App\Modules\Activity\Services\ActivitySwitchService;
@@ -271,7 +270,8 @@ class WelcomeController extends BaseController
         $outstanding_year_order = false;
         if( in_array($this->distribution_channel_id,explode(',',env('OUTSTANDING_YEAR_ORDER_SITE'))) ){
             if($this->uid%2 == 0){
-                $userDivisionProperty = UserDivisionPropertyService::getUserProperty($this->uid);
+                //$userDivisionProperty = UserDivisionPropertyService::getUserProperty($this->uid);
+                $userDivisionProperty = UserDivisionCpcPropertyService::getUserProperty($this->uid);
                 \Log::info('$userDivisionProperty is :'.$userDivisionProperty);
                 $userDivisionProperty && $userDivisionProperty == 'high' && $outstanding_year_order = true;
             }

app/Modules/User/Services/UserDivisionCpcPropertyService.php

@@ -18,6 +18,15 @@ class UserDivisionCpcPropertyService
         return UserDivisionCpcProperty::where('openid',$openid)->where('is_enable',1)->select('property','earliest_subscribe_time','type')->first();
     }
 
+    public static function getUserProperty($uid){
+        $result = UserDivisionCpcProperty::join('users','users.openid','=','user_division_cpc_property.openid')
+            ->where('users.id',$uid)
+            ->select('user_division_cpc_property.property')->first();
+        if($result)
+            return $result->property;
+        return '';
+    }
+
     public static function getUserSubscribeAndChargeInfoByUid($uid){
         $sql_format = "SELECT u.id,f.created_at as subscribe_time,u.openid,
 (SELECT ifnull(sum(price),0) from orders where uid = u.id and `status` = 'PAID' LIMIT 1)as amount,