Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type

Application/Admin/Common/extend.php

@@ -1865,22 +1865,22 @@ function excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_
     foreach ($data['statement_info'] as $key => $value) {
         $objPHPExcel->getActiveSheet()->insertNewRowBefore($line,1)->mergeCells("J$line:K$line");
         $objPHPExcel->getActiveSheet()->setCellValue('C'.$line, $value['statement_begin_time'] . '-' . $value['statement_end_time']);
-        if ($value['statement_type'] == 1) {
+        if ($value['statement_type'] == 1) {//罚款
             $product_name = $value['type_name'];
             $objPHPExcel->getActiveSheet()->setCellValue('F'.$line ,  '-');
             $objPHPExcel->getActiveSheet()->setCellValue('G'.$line,  '-');
             $objPHPExcel->getActiveSheet()->setCellValue('H'.$line, '-');
             $objPHPExcel->getActiveSheet()->setCellValue('I'.$line, '-');
-        } else {
+            $objPHPExcel->getActiveSheet()->setCellValue('E'.$line, $value['sum_money']);
+        } else {//游戏
             $product_name = $value['game_name'];
             $objPHPExcel->getActiveSheet()->setCellValue('F'.$line , $value['first_ratio'] . '%');
             $objPHPExcel->getActiveSheet()->setCellValue('G'.$line, $value['second_ratio'] . '%');
             $objPHPExcel->getActiveSheet()->setCellValue('H'.$line, $value['promote_ratio'] . '%');
             $objPHPExcel->getActiveSheet()->setCellValue('I'.$line, $value['fax_ratio']. '%');
+            $objPHPExcel->getActiveSheet()->setCellValue('E'.$line, $value['pay_amount']);
         }
         $objPHPExcel->getActiveSheet()->setCellValue('D'.$line, $product_name);
-        $objPHPExcel->getActiveSheet()->setCellValue('E'.$line, $value['pay_amount']);
-
         $objPHPExcel->getActiveSheet()->setCellValue('J'.$line, $value['sum_money']);
         $line++;
     }
@@ -1945,17 +1945,18 @@ function excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_al
         $objPHPExcel->getActiveSheet()->removeConditionalStyles();
 
         $objPHPExcel->getActiveSheet()->setCellValue('A'.$line, $value['statement_begin_time'] . '-' . $value['statement_end_time']);
-        if ($value['statement_type'] == 1) {
+        if ($value['statement_type'] == 1) {//罚款
             $product_name = $value['type_name'];
             $objPHPExcel->getActiveSheet()->setCellValue('D'.$line, '-');
             $objPHPExcel->getActiveSheet()->setCellValue('E'.$line, '-');
-        } else {
+            $objPHPExcel->getActiveSheet()->setCellValue('C'.$line, $value['sum_money']);
+        } else {//游戏
             $product_name = $value['game_name'];
             $objPHPExcel->getActiveSheet()->setCellValue('D'.$line, $value['second_ratio'] . '%');
             $objPHPExcel->getActiveSheet()->setCellValue('E'.$line, $value['fax_ratio'] . '%');
+            $objPHPExcel->getActiveSheet()->setCellValue('C'.$line, $value['pay_amount']);
         }
         $objPHPExcel->getActiveSheet()->setCellValue('B'.$line, $product_name);
-        $objPHPExcel->getActiveSheet()->setCellValue('C'.$line, $value['pay_amount']);
         $objPHPExcel->getActiveSheet()->setCellValue('F'.$line, $value['sum_money']);
         $line++;
     }