游戏统计bug修正

Application/Admin/Model/SpendModel.class.php

@@ -849,19 +849,21 @@ class SpendModel extends Model
 
         $query = M("Spend s use index(game_time)","tab_")
             ->field("s.game_id,g.relation_game_name game_name,p.partner as partner_name, g.game_type_name,
-            SUM(CASE WHEN s.pay_status = 1 and pay_game_status=1 and pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count,
-SUM(CASE WHEN s.pay_status = 1 and pay_game_status=1 and pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count,
-SUM(CASE WHEN  s.pay_status = 1 and pay_game_status=1 and pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count,g.sdk_version,SUM(CASE WHEN s.pay_status = 1 and pay_game_status=0 THEN pay_amount ELSE 0 END) as notice_fail_count")
+            SUM(CASE WHEN pay_way > 0 and s.pay_status = 1 and pay_game_status = 1 THEN pay_amount ELSE 0 END) as cash_count,
+SUM(CASE WHEN pay_way = 0 and s.pay_status = 1 and pay_game_status = 1 THEN pay_amount ELSE 0 END) as balance_coin_count,
+SUM(CASE WHEN pay_way = -1 and s.pay_status = 1 and pay_game_status = 1 THEN pay_amount ELSE 0 END) as inside_cash_count,g.sdk_version,notice_fail_count")
             ->join('LEFT JOIN tab_game as g ON s.game_id=g.id')
             ->join('LEFT JOIN tab_partner as p ON g.partner_id=p.id')
-//            ->join("LEFT JOIN ({$noticeFailData})a ON s.game_id = a.game_id")
-//            ->where(['s.pay_status' => 1, 'pay_game_status' => 1])
+            ->join("LEFT JOIN ({$noticeFailData})a ON s.game_id = a.game_id")
+            ->where(['s.pay_status' => 1])
+//            ->where("(s.pay_status = 1 and pay_game_status = 1) or (s.pay_status = 1 and pay_game_status = 0)")
             ->where($map)
             ->group('s.game_id');
         if ($row) {
             $query = $query->page($page,$row);
         }
         $data = $query->select();
+//        var_dump($data);die();
         return $data;
     }
     public function gameStatisticsCount($map)
@@ -871,7 +873,7 @@ SUM(CASE WHEN  s.pay_status = 1 and pay_game_status=1 and pay_way = -1 THEN pay_
             ->field("game_id")
             ->join('LEFT JOIN tab_game as g ON s.game_id=g.id')
             ->join('LEFT JOIN tab_partner as p ON g.partner_id=p.id')
-            ->where(['s.pay_status' => 1, 'pay_game_status' => 1])
+            ->where(['s.pay_status' => 1])
             ->where($map)
             ->group('s.game_id');
         $data = $query->select();
@@ -890,7 +892,7 @@ SUM(CASE WHEN  s.pay_status = 1 and pay_game_status=1 and pay_way = -1 THEN pay_
         $query = M("Spend s use index(game_time)","tab_")
             ->field("SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count,
 SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count,
-SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count,group_concat(s.game_id separator ',') gc_game_id");
+SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count");
         if ($join) {
             $query = $query->join('LEFT JOIN tab_game as g ON s.game_id=g.id')
                 ->join('LEFT JOIN tab_partner as p ON g.partner_id=p.id');
@@ -899,7 +901,7 @@ SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count,grou
             ->where($map)
             ->find();
 
-        $gc_game_id = array_unique(explode(',',$data['gc_game_id']));
+//        $gc_game_id = array_unique(explode(',',$data['gc_game_id']));
 
         $noticeFailData = M("Spend s use index(game_time)","tab_")
             ->field("SUM(pay_amount) as notice_fail_count,game_id")