*

@@ -18,20 +18,33 @@ class MusicianIncomeService extends Service
      */
      */
     public function income()
     public function income()
     {
     {
-        $start_month = $this->request->input('start', date('Ym', strtotime('-6 month')));
-        $end_month   = $this->request->input('end', date('Ym', strtotime('-1 month')));
+        $start_month = $this->request->input('start');
+        $end_month   = $this->request->input('end');
 
 
         $res = StakeholderSongCollate::query()->custom($this->request->only(['song_id']))->identify()
         $res = StakeholderSongCollate::query()->custom($this->request->only(['song_id']))->identify()
                 ->groupBy('month')->orderBy('month')->selectRaw('month, sum(share_amount) as income')->get()->toArray();
                 ->groupBy('month')->orderBy('month')->selectRaw('month, sum(share_amount) as income')->get()->toArray();
 
 
         $stat_income = [];
         $stat_income = [];
+        $total_income = '0';
         foreach ($res as $item) {
         foreach ($res as $item) {
+
+            if (empty($start_month) || empty($end_month)) {
+
+                if (count($stat_income) < 7) {
+                    $stat_income[] = $item;
+                    continue;
+                }
+                break;
+            } else {
                 if ($item['month'] >= $start_month && $item['month'] <= $end_month) {
                 if ($item['month'] >= $start_month && $item['month'] <= $end_month) {
                     $stat_income[] = $item;
                     $stat_income[] = $item;
                 }
                 }
             }
             }
 
 
-        return Response::success($stat_income);
+            $total_income = bcadd($total_income, $item->income, self::DECIMAL);
+        }
+
+        return Response::success(['list'=>$stat_income, 'total_income'=>$total_income]);
     }
     }
 
 
     /**
     /**