Merge commit 'f1508732b986c6b6a8237d80377f1a1be51cc092' into dev

# Conflicts:
#	app/v1/controller/advert/AgentSiteController.php

app/process/advert/TtCostHour.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace app\process\advert;
+use Workerman\Crontab\Crontab;
+use app\v1\logic\tool\advertCost\TtCostHourLogic;
+
+class TtCostHour
+{
+    public function onWorkerStart(): void
+    {
+        // 每 10分钟执行一次
+        new Crontab('0 */10 * * * *', function() {
+            (new TtCostHourLogic())->run();
+        });
+    }
+}

app/v1/controller/advert/AgentSiteController.php

@@ -56,9 +56,14 @@ class AgentSiteController extends BaseController
         ]);
 
         if(!empty($where['agent_name'])){
-            $where['agent_id'] = $this->agentListLogic->where([
+            $agentIds = $this->agentListLogic->where([
                 ['name', 'like', '%'.$where['agent_name'].'%']
             ])->column('id');
+
+            if($agentIds){
+                $where['agent_id'] = $agentIds;
+            }
+
             unset($where['agent_name']);
         }
 

app/v1/controller/advert/GamePackLogController.php

@@ -51,7 +51,8 @@ class GamePackLogController extends BaseController
     public function batchSave(Request $request): Response
     {
         $data = $request->all();
-        $res = $this->logic->batchSave($data);
+        $this->logic->batchSave($data);
+
         return $this->success();
     }
 

app/v1/controller/center/GameController.php

@@ -20,7 +20,7 @@ use support\Response;
 class GameController extends BaseController
 {
 
-  protected $systemDeptLogic;
+    protected $systemDeptLogic;
     /**
      * 构造函数
      */

app/v1/controller/customer/AccountController.php

@@ -38,8 +38,7 @@ class AccountController extends BaseController
             ['val', ''],
             ['type', '']
         ]);
-        // $query = $this->logic->search($where);
-        // $data = $this->logic->getList($query);
+
         $data = $this->logic->list($where);
         return $this->success($data);
     }
@@ -95,7 +94,7 @@ class AccountController extends BaseController
         $data = $request->post();
         $info = getCurrentInfo();
         $data['auth_id'] = $info['id'];
-        $data = $this->logic->saveBan($data);
+        $this->logic->saveBan($data);
         return $this->success();
     }
 }

app/v1/controller/customer/RoleDataController.php

@@ -45,7 +45,6 @@ class RoleDataController extends BaseController
             return $this->fail('请填写用户信息或者角色信息');
         }
         $query = $this->logic->search($where);
-        // $data = $this->logic->getList($query);
         $data = $this->logic->getRoleList($query);
         return $this->success($data);
     }

app/v1/controller/customer/SdkOrderController.php

@@ -50,8 +50,7 @@ class SdkOrderController extends BaseController
         if(empty($where['user_name']) && empty($where['order_id']) && empty($where['trade_id'])){
             return $this->fail('账号名|订单号|交易订单号 不能同时为空');
         }
-        // $query = $this->logic->search($where);
-        // $data = $this->logic->getList($query);
+
         $data = $this->logic->getOrderList($where);
         return $this->success($data);
     }

app/v1/logic/advert/GamePackLogLogic.php

@@ -29,10 +29,9 @@ class GamePackLogLogic extends BaseLogic
     /**
      * 批量打包
      */
-    public function batchSave($data)
+    public function batchSave($data): int
     {
-        $res = $this->model->insertAll($data);
-        return $res;
+        return $this->model->insertAll($data);
     }
 
 

app/v1/model/advert/AgentSite.php

@@ -39,4 +39,12 @@ class AgentSite extends BaseNormalModel
         $query->where('name', 'like', '%'.$value.'%');
     }
 
+    /**
+     * agent_id 搜索
+     */
+    public function searchAgentIdAttr($query, $value)
+    {
+        $query->where('agent_id', 'in', $value);
+    }
+
 }

config/process.php

@@ -78,4 +78,8 @@ return [
     'gdt_cost' =>  [
         'handler' => \app\process\advert\GdtCostHour::class,
     ],
+    // gdt 获取广告消耗
+    'tt_cost' =>  [
+        'handler' => \app\process\advert\TtCostHour::class,
+    ],
 ];