Merge branch 'zz/dev001' into dev/test

app/Console/Commands/ReferralLinkPidDraw.php

@@ -85,7 +85,7 @@ class ReferralLinkPidDraw extends Command
 
             if ($res) {
                 $upDb = ['is_draw' => 1];
-                if (!is_null($pid)) $upDb['pid'] = $pid;
+                if (!is_null($pid)) $upDb['pids'] = $pid;
 
                 $item->update($upDb);
             }

app/Console/Commands/Test.php

@@ -695,11 +695,15 @@ class Test extends Command
                     continue;
                 }
 
+                $pid = null;
                 $res = MassMsgService::drawPid($data, $pid, 'test');
                 if ($res) {
-                    if (!is_null($pid)) $upDb['pid'] = $pid;
+                    if (!is_null($pid)) {
+                        $upDb['pids'] = $pid;
+                        $item->update($upDb);
+                    }
+
 
-                    $item->update($upDb);
                 }
             }
         }

app/Models/MassMsg.php

@@ -148,7 +148,7 @@ class MassMsg extends Model
         }
 
         $popu_data = array();
-        $pidVals = $data->pluck('pid')->all();
+        $pidVals = $data->pluck('pids')->all();
         $pids = [];
         foreach ($pidVals as $pidVal) {
             if (empty($pidVal)) continue;

app/Models/MomentTask.php

@@ -132,7 +132,7 @@ class MomentTask extends Model
 
         $popu_data = null;
         $pids = [];
-        $pidVals = $data->pluck('pid')->all();
+        $pidVals = $data->pluck('pids')->all();
         foreach ($pidVals as $pidVal) {
             if (empty($pidVal)) continue;
 

app/Service/PopularizService.php

@@ -45,7 +45,7 @@ class PopularizService
 
             #统计回收信息
             $pids = [];
-            $pidVals = $list->pluck('pid')->all();
+            $pidVals = $list->pluck('pids')->all();
             foreach ($pidVals as $pidVal) {
                 if (empty($pidVal)) continue;
 
@@ -109,7 +109,7 @@ class PopularizService
                 $datum->send_total = isset($sendStatInfo->send_total) ? $sendStatInfo->send_total : 0;
                 unset($datum->admin_id);
 
-                $datumPids = json_decode($datum->pid, true);
+                $datumPids = json_decode($datum->pids, true);
                 #统计 总播放人数（：总uv）  充值人数 充值次数（今日） 充值金额（今日）   付费率 点击率
                 if($datumPids){
                     $datum->payAvg = $datum->payUv>0 ? round($datum->payPv/$datum->payUv, 2) : null;
@@ -235,7 +235,7 @@ class PopularizService
 
             #统计回收信息
             $pids = [];
-            $pidVals = $list->pluck('pid')->all();
+            $pidVals = $list->pluck('pids')->all();
             foreach ($pidVals as $pidVal) {
                 if (empty($pidVal)) continue;
 
@@ -295,7 +295,7 @@ class PopularizService
 
                 unset($datum->admin_id);
 
-                $datumPids = json_decode($datum->pid, true);
+                $datumPids = json_decode($datum->pids, true);
                 #统计 总播放人数（：总uv）  充值人数 充值次数（今日） 充值金额（今日）   付费率 点击率
                 if($datumPids){
                     $datum->payAvg = $datum->payUv>0 ? round($datum->payPv/$datum->payUv, 2) : null;