zz пре 6 година
родитељ
комит
d31d2be4d8

+ 9 - 5
app/Http/Controllers/Wap/Web/WelcomeController.php

@@ -14,6 +14,7 @@ use App\Modules\OfficialAccount\Services\ForceSubscribeService;
 use App\Modules\Statistic\Services\DataAnalysisSelectUserService;
 use App\Modules\Subscribe\Services\OrderService;
 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 Illuminate\Http\Request;
@@ -2027,16 +2028,19 @@ class WelcomeController extends BaseController
 
 
     private function userPproperty($openid){
+        $old = UserDivisionCpcPropertyService::userLevel($openid);
+        if(!$old) return ;
+        if($old->type != 'NEW') return ;
+        $send_data = array(
+            'type' => 'visit',
+            'data' => ['openid'=>$openid,'uid'=>$this->uid]
+        );
         try {
-            $send_data = array(
-                'type' => 'visit',
-                'data' => ['openid'=>$openid,'uid'=>$this->uid]
-            );
             $send = new SendStatisticsList($send_data);
             $job = ($send)->onConnection('rabbitmq')->delay(0)->onQueue('send_statistics_list');
             dispatch($job);
         } catch (\Exception $e) {
-            Log::info($e);
+            \Log::info($e);
         }
     }
 }

+ 2 - 2
app/Jobs/SendStatisticsList.php

@@ -36,9 +36,9 @@ class SendStatisticsList extends Job implements ShouldQueue
         if($this->data['type'] == 'order_info'){
             $this->orderInfo($this->data['data']);
         }elseif($this->data['type'] == 'visit'){
-            $this->visit($this->data['openid']);
+            $this->visit($this->data['data']['openid']);
         }elseif($this->data['type'] == 'subscribe'){
-            $this->subscribe($this->data['uid']);
+            $this->subscribe($this->data['data']['uid']);
         }
         else{
             $this->subscribe_info($this->data['data']);

+ 1 - 1
app/Modules/User/Services/UserDivisionCpcPropertyService.php

@@ -15,7 +15,7 @@ class UserDivisionCpcPropertyService
 {
 
     public static function userLevel($openid){
-        return UserDivisionCpcProperty::where('openid',$openid)->where('is_enable',1)->select('property','earliest_subscribe_time')->first();
+        return UserDivisionCpcProperty::where('openid',$openid)->where('is_enable',1)->select('property','earliest_subscribe_time','type')->first();
     }
 
     public static function getUserSubscribeAndChargeInfoByUid($uid){