Merge branch 'colonel' of https://git.yidian-inc.com:8021/bp/goods into colonel

application/services/marketing/ColonelService.php

@@ -116,12 +116,14 @@ class ColonelService
         if (empty($result['count'])) {
             return $result;
         }
-        $userMap = self::getUserMap(array_column($result['result'], 'user_id'));
+        $userIds = array_column($result['result'], 'user_id');
+        $userMap = self::getUserMap($userIds);
+        $incomeMap = PindanActivityInviteOrderService::incomeStatistics(["user_ids" => $userIds]);
         foreach ($result['result'] as &$colonelVal) {
-            $colonelVal['user_avatar'] = !empty($userMap[$colonelVal['user_id']]['user_avatar']) ? $userMap[$colonelVal['user_id']]['user_avatar'] : '';
-            // TODO 昨日收益  总收益
-            $colonelVal['yesterday_income'] = 0;
-            $colonelVal['total_income'] = 0;
+            $userId = $colonelVal['user_id'];
+            $colonelVal['user_avatar'] = !empty($userMap[$userId]['user_avatar']) ? $userMap[$userId]['user_avatar'] : '';
+            $colonelVal['yesterday_income'] = !empty($incomeMap[$userId]['yesterday_reward']) ? $incomeMap[$userId]['yesterday_reward'] : 0;
+            $colonelVal['total_income'] = !empty($incomeMap[$userId]['all_reward']) ? $incomeMap[$userId]['all_reward'] : 0;
         }
         unset($colonelVal);
         return $result;