Merge branch 'zz/dev001' into dev/test

app/Models/MassMsg.php

@@ -148,8 +148,15 @@ class MassMsg extends Model
         }
 
         $popu_data = array();
-        $pids = $data->pluck('pid')->all();
-        $pids = array_filter($pids);
+        $pidVals = $data->pluck('pid')->all();
+        $pids = [];
+        foreach ($pidVals as $pidVal) {
+            if (empty($pidVal)) continue;
+
+            $itemPids = json_decode($pidVal, true);
+            $pids = array_merge($pids, $itemPids);
+        }
+
         if( !empty($pids) ){
             $popu_data = MassPopularizData::selectRaw('sum(viewUv) as viewUv, sum(payPv) as payPv, sum(payUv) as payUv, sum(payMoney) as payMoney')->whereIn('pid', $pids)->first();
 

app/Models/MomentTask.php

@@ -131,7 +131,15 @@ class MomentTask extends Model
 //        }
 
         $popu_data = null;
-        $pids = $data->pluck('pid')->all();
+        $pids = [];
+        $pidVals = $data->pluck('pid')->all();
+        foreach ($pidVals as $pidVal) {
+            if (empty($pidVal)) continue;
+
+            $itemPids = json_decode($pidVal, true);
+            $pids = array_merge($pids, $itemPids);
+        }
+
         $pids = array_filter($pids);
         if( !empty($pids) ){
             $popu_data = MassPopularizData::selectRaw('sum(viewUv) as viewUv, sum(payPv) as payPv, sum(payUv) as payUv, sum(payMoney) as payMoney')->whereIn('pid', $pids)->first();

app/Service/MassMsgService.php

@@ -122,12 +122,12 @@ class MassMsgService
                 }
             }
 
-            if (count($drawPids) > 1) {
-                Log::logError('提取推广链接PID存在多个值', $datum, $logName);
-                return false;
-            }
+//            if (count($drawPids) > 1) {
+//                Log::logError('提取推广链接PID存在多个值', $datum, $logName);
+//                return false;
+//            }
 
-            if (!empty($drawPids)) $pid = current($drawPids);
+            if (!empty($drawPids)) $pid = json_encode(array_filter($drawPids));
 
             Log::logInfo('提取结束', $attachments, $logName);
         }

app/Service/PopularizService.php

@@ -44,8 +44,15 @@ class PopularizService
                 ->whereIn('rule_id', $ruleIds)->groupBy(['rule_id'])->get();
 
             #统计回收信息
-            $pids = $list->pluck('pid')->all();
-            $pids = array_filter($pids);
+            $pids = [];
+            $pidVals = $list->pluck('pid')->all();
+            foreach ($pidVals as $pidVal) {
+                if (empty($pidVal)) continue;
+
+                $itemPids = json_decode($pidVal, true);
+                $pids = array_merge($pids, $itemPids);
+            }
+
             if( !empty($pids) ){
                 $popu_data = MassPopularizData::select('viewPv', 'viewUv', 'payPv', 'payUv', 'payMoney', 'pid', 'playletActivityId')
                     ->whereIn('pid', $pids)
@@ -102,35 +109,57 @@ class PopularizService
                 $datum->send_total = isset($sendStatInfo->send_total) ? $sendStatInfo->send_total : 0;
                 unset($datum->admin_id);
 
-                $pid = $datum->pid;
+                $datumPids = json_decode($datum->pid, true);
                 #统计 总播放人数（：总uv）  充值人数 充值次数（今日） 充值金额（今日）   付费率 点击率
-                if($pid){
-                    $popu_info = $popu_data->where('pid', $pid)->first();
-
-                    $datum->viewUv = $popu_info->viewUv ?? null;
-                    $datum->payUv = $popu_info->payUv ?? null;
-                    $datum->payPv = $popu_info->payPv ?? null;
-                    $datum->payMoney = $popu_info->payMoney ?? null;
+                if($datumPids){
                     $datum->payAvg = $datum->payUv>0 ? round($datum->payPv/$datum->payUv, 2) : null;
                     $datum->payRate = $datum->viewUv>0 ? round($datum->payUv/$datum->viewUv*100, 2) .'%' : null;
                     $datum->clickRate = $datum->send_success>0 ? round($datum->viewUv/$datum->send_success*100, 2) .'%' : null;
 
-                    if(isset($popu_info->playletActivityId)) {
-                        $datum->newPayUv = $orderData[$popu_info->playletActivityId]['newPayUv'] ?? null;
-                        $datum->newPayPv = $orderData[$popu_info->playletActivityId]['newPayPv'] ?? null;
-                        $datum->newPayAmount = isset($orderData[$popu_info->playletActivityId]['newPayAmount']) ? round($orderData[$popu_info->playletActivityId]['newPayAmount']/10000, 2) : null;
-                        $datum->oldPayAmount = isset($orderData[$popu_info->playletActivityId]['oldPayAmount']) ? round($orderData[$popu_info->playletActivityId]['oldPayAmount']/10000, 2) : null;
-                        $datum->otherPayAmount = isset($otherOrderData[$popu_info->playletActivityId]['otherPayAmount']) ? round($otherOrderData[$popu_info->playletActivityId]['otherPayAmount']/10000, 2) : null;
+                    $popu_list = MassPopularizData::select('viewPv', 'viewUv', 'payPv', 'payUv', 'payMoney', 'pid', 'playletActivityId')
+                        ->whereIn('pid', $datumPids)
+                        ->get();
+                    if ($popu_list->isNotEmpty()) {
+                        $datum->viewUv         = 0;
+                        $datum->payUv          = 0;
+                        $datum->payPv          = 0;
+                        $datum->payMoney       = 0;
+                        $datum->newPayUv       = 0;
+                        $datum->newPayPv       = 0;
+                        $datum->newPayAmount   = 0;
+                        $datum->oldPayAmount   = 0;
+                        $datum->otherPayAmount = 0;
+                        foreach ($popu_list as $popu_info) {
+                            $datum->viewUv   += ($popu_info->viewUv ?? 0);
+                            $datum->payUv    += ($popu_info->payUv ?? 0);
+                            $datum->payPv    += ($popu_info->payPv ?? 0);
+                            $datum->payMoney += ($popu_info->payMoney ?? 0);
+
+                            if(isset($popu_info->playletActivityId)) {
+                                $datum->newPayUv       += ($orderData[$popu_info->playletActivityId]['newPayUv'] ?? 0);
+                                $datum->newPayPv       += ($orderData[$popu_info->playletActivityId]['newPayPv'] ?? 0);
+                                $datum->newPayAmount   += ($orderData[$popu_info->playletActivityId]['newPayAmount'] ?? 0);
+                                $datum->oldPayAmount   += ($orderData[$popu_info->playletActivityId]['oldPayAmount'] ?? 0);
+                                $datum->otherPayAmount += ($otherOrderData[$popu_info->playletActivityId]['otherPayAmount'] ?? 0);
+                            }
+                        }
+
+                        $datum->newPayAmount   = round($orderData[$popu_info->playletActivityId]['newPayAmount']/10000, 2);
+                        $datum->oldPayAmount   = round($orderData[$popu_info->playletActivityId]['oldPayAmount']/10000, 2);
+                        $datum->otherPayAmount = round($otherOrderData[$popu_info->playletActivityId]['otherPayAmount']/10000, 2);
+                        $datum->newPayAvg      = $datum->newPayUv>0 ? round($datum->newPayPv/$datum->newPayUv, 2) : null;
                     } else {
-                        $datum->newPayUv = null;
-                        $datum->newPayPv = null;
-                        $datum->newPayAmount = null;
-                        $datum->oldPayAmount = null;
+                        $datum->viewUv         = null;
+                        $datum->payUv          = null;
+                        $datum->payPv          = null;
+                        $datum->payMoney       = null;
+                        $datum->newPayUv       = null;
+                        $datum->newPayPv       = null;
+                        $datum->newPayAmount   = null;
+                        $datum->oldPayAmount   = null;
                         $datum->otherPayAmount = null;
+                        $datum->newPayAvg      = null;
                     }
-
-                    $datum->newPayAvg = $datum->newPayUv>0 ? round($datum->newPayPv/$datum->newPayUv, 2) : null;
-
                 } else {
                     $datum->viewUv = null;
                     $datum->payUv = null;
@@ -205,8 +234,15 @@ class PopularizService
                 ->whereIn('rule_id', $ruleIds)->groupBy(['rule_id'])->get();
 
             #统计回收信息
-            $pids = $list->pluck('pid')->all();
-            $pids = array_filter($pids);
+            $pids = [];
+            $pidVals = $list->pluck('pid')->all();
+            foreach ($pidVals as $pidVal) {
+                if (empty($pidVal)) continue;
+
+                $itemPids = json_decode($pidVal, true);
+                $pids = array_merge($pids, $itemPids);
+            }
+
             if( !empty($pids) ){
                 $popu_data = MassPopularizData::select('viewPv', 'viewUv', 'payPv', 'payUv', 'payMoney', 'pid', 'playletActivityId')
                     ->whereIn('pid', $pids)
@@ -259,35 +295,55 @@ class PopularizService
 
                 unset($datum->admin_id);
 
-                $pid = $datum->pid;
+                $datumPids = json_decode($datum->pid, true);
                 #统计 总播放人数（：总uv）  充值人数 充值次数（今日） 充值金额（今日）   付费率 点击率
-                if($pid){
-                    $popu_info = $popu_data->where('pid', $pid)->first();
-
-                    $datum->viewUv = $popu_info->viewUv ?? null;
-                    $datum->payUv = $popu_info->payUv ?? null;
-                    $datum->payPv = $popu_info->payPv ?? null;
-                    $datum->payMoney = $popu_info->payMoney ?? null;
+                if($datumPids){
                     $datum->payAvg = $datum->payUv>0 ? round($datum->payPv/$datum->payUv, 2) : null;
                     $datum->payRate = $datum->viewUv>0 ? round($datum->payUv/$datum->viewUv*100, 2) .'%' : null;
                     $datum->clickRate = $datum->published_count>0 ? round($datum->viewUv/$datum->published_count*100, 2) .'%' : null;
 
-                    if(isset($popu_info->playletActivityId)) {
-                        $datum->newPayUv = $orderData[$popu_info->playletActivityId]['newPayUv'] ?? null;
-                        $datum->newPayPv = $orderData[$popu_info->playletActivityId]['newPayPv'] ?? null;
-                        $datum->newPayAmount = isset($orderData[$popu_info->playletActivityId]['newPayAmount']) ? round($orderData[$popu_info->playletActivityId]['newPayAmount']/10000, 2) : null;
-                        $datum->oldPayAmount = isset($orderData[$popu_info->playletActivityId]['oldPayAmount']) ? round($orderData[$popu_info->playletActivityId]['oldPayAmount']/10000, 2) : null;
-                        $datum->otherPayAmount = isset($otherOrderData[$popu_info->playletActivityId]['otherPayAmount']) ? round($otherOrderData[$popu_info->playletActivityId]['otherPayAmount']/10000, 2) : null;
+                    $popu_list = MassPopularizData::select('viewPv', 'viewUv', 'payPv', 'payUv', 'payMoney', 'pid', 'playletActivityId')
+                        ->whereIn('pid', $datumPids)
+                        ->get();
+                    if ($popu_list->isNotEmpty()) {
+                        $datum->viewUv         = 0;
+                        $datum->payUv          = 0;
+                        $datum->payPv          = 0;
+                        $datum->payMoney       = 0;
+                        $datum->newPayUv       = 0;
+                        $datum->newPayPv       = 0;
+                        $datum->newPayAmount   = 0;
+                        $datum->oldPayAmount   = 0;
+                        $datum->otherPayAmount = 0;
+                        foreach ($popu_list as $popu_info) {
+                            $datum->viewUv   += ($popu_info->viewUv ?? 0);
+                            $datum->payUv    += ($popu_info->payUv ?? 0);
+                            $datum->payPv    += ($popu_info->payPv ?? 0);
+                            $datum->payMoney += ($popu_info->payMoney ?? 0);
+                            if(isset($popu_info->playletActivityId)) {
+                                $datum->newPayUv       += ($orderData[$popu_info->playletActivityId]['newPayUv'] ?? 0);
+                                $datum->newPayPv       += ($orderData[$popu_info->playletActivityId]['newPayPv'] ?? 0);
+                                $datum->newPayAmount   += ($orderData[$popu_info->playletActivityId]['newPayAmount'] ?? 0);
+                                $datum->oldPayAmount   += ($orderData[$popu_info->playletActivityId]['oldPayAmount'] ?? 0);
+                                $datum->otherPayAmount += ($otherOrderData[$popu_info->playletActivityId]['otherPayAmount'] ?? 0);
+                            }
+                        }
+                        $datum->newPayAmount   = round($orderData[$popu_info->playletActivityId]['newPayAmount']/10000, 2);
+                        $datum->oldPayAmount   = round($orderData[$popu_info->playletActivityId]['oldPayAmount']/10000, 2);
+                        $datum->otherPayAmount = round($otherOrderData[$popu_info->playletActivityId]['otherPayAmount']/10000, 2);
+                        $datum->newPayAvg      = $datum->newPayUv>0 ? round($datum->newPayPv/$datum->newPayUv, 2) : null;
                     } else {
-                        $datum->newPayUv = null;
-                        $datum->newPayPv = null;
-                        $datum->newPayAmount = null;
-                        $datum->oldPayAmount = null;
-                        $datum->otherPayAmount = null;
+                        $datum->viewUv         = 0;
+                        $datum->payUv          = 0;
+                        $datum->payPv          = 0;
+                        $datum->payMoney       = 0;
+                        $datum->newPayUv       = 0;
+                        $datum->newPayPv       = 0;
+                        $datum->newPayAmount   = 0;
+                        $datum->oldPayAmount   = 0;
+                        $datum->otherPayAmount = 0;
+                        $datum->newPayAvg      = 0;
                     }
-
-                    $datum->newPayAvg = $datum->newPayUv>0 ? round($datum->newPayPv/$datum->newPayUv, 2) : null;
-
                 } else {
                     $datum->viewUv = null;
                     $datum->payUv = null;