充值渠道收入添加负责人

app/v1/controller/customer/ReconciliationController.php

@@ -21,11 +21,13 @@ class ReconciliationController extends BaseController
   public function getChannelIncome(Request $request)
   {
     $where = $request->more([
-            ['pay_date', ''],
+            ['pay_time', ''],
             ['game_id', ''],
             ['pay_channel_id', ''],
+            ['auth_id', ''],
         ]);
     $result = $this->logic->getChannelIncome($where);
+    
     return $this->success($result);
   }
 

app/v1/logic/customer/ReconciliationLogic.php

@@ -13,23 +13,15 @@ class ReconciliationLogic extends BaseLogic
 
         $params = $this->searchByAuth($where);
 
-        $channelIncomeQuery = Db::connect('db_game_log')->table('sdk_order_success');
-
-        if (!empty($params['pay_date'])) {
-            $channelIncomeQuery = $channelIncomeQuery
-                ->where('pay_date', 'between', [$params['pay_date'][0] . ' 00:00:00', $params['pay_date'][1] . ' 23:59:59']);
-        }
-
+        $where = $this->getCommonWhereRaw($params);
         if (!empty($params['pay_channel_id'])) {
-            $channelIncomeQuery->where('pay_channel_id', $params['pay_channel_id']);
-        }
-
-        if (!empty($params['game_id'])) {
-            $channelIncomeQuery->where('game_id', $params['game_id']);
+            $where .= " AND pay_channel_id IN (" . implode(',', $params['pay_channel_id']) . ")";
         }
+        $channelIncomeQuery = Db::connect('db_game_log')->table('sdk_order_success');
 
-        $channelIncomeQuery->field('game_id,pay_channel_id,sum(money) as money');
+        $channelIncomeQuery->whereRaw($where);
 
+        $channelIncomeQuery->field('game_id,auth_id,pay_channel_id,sum(money) as money');
 
         $channelIncomeQuery->group('pay_channel_id');
 
@@ -37,17 +29,26 @@ class ReconciliationLogic extends BaseLogic
             [
                 'title' => '游戏ID',
                 'dataIndex' => 'game_id',
-                'width' => 100,
+                'width' => 80,
+                'align' => 'center',
             ],
             [
                 'title' => '游戏名称',
                 'dataIndex' => 'game_name',
                 'width' => 150,
+                'align' => 'center',
+            ],
+            [
+                'title' => '负责人',
+                'dataIndex' => 'auth_name',
+                'width' => 100,
+                'align' => 'center',
             ],
             [
                 'title' => '合计',
                 'dataIndex' => 'money',
                 'width' => 100,
+                'align' => 'center',
             ],
         ];
 
@@ -65,15 +66,17 @@ class ReconciliationLogic extends BaseLogic
             $columns[] = [
                 'title' => $title,
                 'dataIndex' => 'pay_channel_id_' . $payChannelId,
-                'width' => 120,
+                'width' => 140,
+                'align' => 'center',
+                
             ];
         }
 
-
         $data = $channelIncomeQuery->select()->toArray();
 
+        
 
-        $data = $this->trandformListColumn($data, ['game', 'pay_channel']);
+        $data = $this->trandformListColumn($data, ['game', 'pay_channel', 'auth']);
 
         foreach ($data as $key => $value) {
 
@@ -89,6 +92,8 @@ class ReconciliationLogic extends BaseLogic
                 $mergedData[$gameId] = [
                     'game_id' => $gameId,
                     'game_name' => $item['game_name'],
+                    'auth_id' => $item['auth_id'],
+                    'auth_name' => $item['auth_name'],
                     'money' => 0
                 ];
 
@@ -127,13 +132,10 @@ class ReconciliationLogic extends BaseLogic
             }
         }
 
-        // 将合计行插入到数组最前面
-        array_unshift($mergedData, $totalRow);
-        // 转为数组格式
-        $data = array_values($mergedData);
         return [
             'columns' => $columns,
-            'data' => $data,
+            'data' => array_values($mergedData),
+            'totalRow' => $totalRow
         ];
     }
 }