Merge remote-tracking branch 'origin/develop' into akun

@@ -5,9 +5,12 @@ namespace App\Http\Controllers\Aside\Optimize;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\Optimize\OptimizeLogic;
 use App\Http\Logic\Aside\Optimize\OptimizeLogic;
+use App\Models\ASide\APublicModel;
+use App\Models\Channel\Channel;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Manage\Manage;
 use App\Models\Manage\Manage;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
+use App\Models\Task\Task;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
 
 
 /**
 /**
@@ -32,14 +35,8 @@ class OptimizeController extends BaseController
         $query = $this->searchParam($query);
         $query = $this->searchParam($query);
         $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray();
         $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray();
         if(!empty($lists['list'])){
         if(!empty($lists['list'])){
-            $manager = new Manage();
-            $domainModel = new DomainInfo();
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
-                $v['plan'] = $project::planMap()[$v['plan']];
-                $v['optimist_mid_name'] = $manager->getName($v['optimist_mid']);
-                $v['tech_mid_name'] = $manager->getName($v['tech_mid']);
-                $v['autologin_code'] = getAutoLoginCode($v['id']);
-                $v['domain'] = $domainModel->getDomain($v['domain']);
+                $v = $this->handleParam($v);
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }
@@ -47,6 +44,40 @@ class OptimizeController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @remark :参数处理
+     * @name   :handleParam
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/18 14:44
+     */
+    public function handleParam(&$item){
+        if($item['type'] != Project::TYPE_ZERO){
+            $data = APublicModel::getNumByProjectId($item['id']);
+        }
+        $manageModel = new Manage();
+        $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0);
+        $item['build_leader'] = $manageModel->getName($item['leader_mid']);
+        $item['build_manager'] = $manageModel->getName($item['manager_mid']);
+        $item['build_designer'] = $manageModel->getName($item['designer_mid']);
+        $item['build_tech'] = $manageModel->getName($item['tech_mid']);
+        $item['optimize_manager'] = $manageModel->getName($item['optimize_manager_mid']);
+        $item['optimize_optimist'] = $manageModel->getName($item['optimize_optimist_mid']);
+        $item['optimize_assist'] = $manageModel->getName($item['optimize_assist_mid']);
+        $item['optimize_tech'] = $manageModel->getName($item['optimize_tech_mid']);
+        $item['plan'] = Project::planMap()[$item['plan']];
+        $item['created_at'] = date('Y年m月d日', strtotime($item['cooperate_date']));
+        $item['autologin_code'] = getAutoLoginCode($item['id']);
+        $domainModel = new DomainInfo();
+        $item['domain'] = !empty($item['domain']) ?  $domainModel->getDomain($item['domain']) : '';
+        $item['product_num'] = $data['product'] ?? 0;
+        $item['keyword_num'] = $item['key'] ?? 0;
+        $item['autologin_code'] = getAutoLoginCode($item['id']);
+        $item['article_num'] = ($data['blog'] ?? 0) + ($data['news'] ?? 0);
+        $item['task_finish_num'] = Task::getNumByProjectId($item['id'], Task::STATUS_DOWN);
+        $item['task_pending_num'] = Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]);
+        return $item;
+    }
+    /**
      * @remark :查询字段处理
      * @remark :查询字段处理
      * @name   :selectParam
      * @name   :selectParam
      * @author :lyh
      * @author :lyh
@@ -57,14 +88,32 @@ class OptimizeController extends BaseController
         $select = [
         $select = [
             'gl_project.id AS id',
             'gl_project.id AS id',
             'gl_project.title AS title',
             'gl_project.title AS title',
+            'gl_project.channel AS channel',
             'gl_project.company AS company',
             'gl_project.company AS company',
             'gl_project.type AS type',
             'gl_project.type AS type',
-            'gl_project_deploy_build.service_duration AS service_duration',
-            'gl_project_deploy_build.plan AS plan',
+            'gl_project.created_at AS created_at',
+            'gl_project.cooperate_date AS cooperate_date',
             'gl_project_payment.amount AS amount',
             'gl_project_payment.amount AS amount',
-            'gl_project_deploy_optimize.optimist_mid AS optimist_mid',
-            'gl_project_deploy_optimize.tech_mid AS tech_mid',
+            'gl_project_deploy_build.dept_id AS dept_id',
+            'gl_project_deploy_build.keyword_num AS key',
+            'gl_project_deploy_build.service_duration AS day',
+            'gl_project_deploy_build.leader_mid AS leader_mid',
+            'gl_project_deploy_build.manager_mid AS manager_mid',
+            'gl_project_deploy_build.designer_mid AS designer_mid',
+            'gl_project_deploy_build.tech_mid AS tech_mid',
+            'gl_project_deploy_build.test_domain AS test_domain',
+            'gl_project_deploy_build.plan AS plan',
+            'gl_project_deploy_optimize.dept_id AS optimize_dept_id',
+            'gl_project_deploy_optimize.manager_mid AS optimize_manager_mid',
+            'gl_project_deploy_optimize.optimist_mid AS optimize_optimist_mid',
+            'gl_project_deploy_optimize.assist_mid AS optimize_assist_mid',
+            'gl_project_deploy_optimize.tech_mid AS optimize_tech_mid',
+            'gl_project_deploy_optimize.design_mid AS design_mid',
+            'gl_project_deploy_optimize.tech_leader AS tech_leader',
             'gl_project_deploy_optimize.domain AS domain',
             'gl_project_deploy_optimize.domain AS domain',
+            'gl_project_deploy_optimize.quality_mid AS quality_mid',
+            'gl_project_deploy_optimize.design_mid AS design_mid',
+            'gl_project_payment.amount AS amount',
         ];
         ];
         return $select;
         return $select;
     }
     }
@@ -85,23 +134,4 @@ class OptimizeController extends BaseController
         return $query;
         return $query;
     }
     }
 
 
-    /**
-     * @remark :授权域名
-     * @name   :empowerDomain
-     * @author :lyh
-     * @method :post
-     * @time   :2023/6/20 15:10
-     */
-    public function empowerDomain(OptimizeLogic $optimizeLogic){
-        $this->request->validate([
-            'id'=>'required',
-            'gsc_id'=>'required'
-        ],[
-            'id.required' => '审核域名ID不能为空',
-            'gsc_id.required' => 'GSC账号ID不能为空'
-        ]);
-        $optimizeLogic->empowerDomain();
-        $this->response('success');
-    }
-
 }
 }

@@ -53,7 +53,9 @@ class ProjectController extends BaseController
         $query = $project->leftJoin('gl_project_payment', 'gl_project.id', '=', 'gl_project_payment.project_id')
         $query = $project->leftJoin('gl_project_payment', 'gl_project.id', '=', 'gl_project_payment.project_id')
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
-            ->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id');
+            ->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id')
+            ->where('gl_project.delete_status',Project::TYPE_ZERO)
+            ->where('gl_project.extend_type',Project::TYPE_ZERO);
         $query = $this->searchParam($query);
         $query = $this->searchParam($query);
         $lists = $query->orderBy('gl_project.id', 'desc')->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray();
         $lists = $query->orderBy('gl_project.id', 'desc')->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray();
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
@@ -94,11 +96,6 @@ class ProjectController extends BaseController
      * @time   :2023/8/30 10:14
      * @time   :2023/8/30 10:14
      */
      */
     public function searchType(&$query){
     public function searchType(&$query){
-        $query->where('gl_project.delete_status',Project::TYPE_ZERO);
-        $query->where('gl_project.extend_type',Project::TYPE_ZERO);
-        if(!isset($this->map['type'])){
-            $this->map['type'] = Project::TYPE_ZERO;
-        }
         if($this->map['type'] == Project::TYPE_ZERO){
         if($this->map['type'] == Project::TYPE_ZERO){
             $query->where('gl_project.type',Project::TYPE_ZERO);
             $query->where('gl_project.type',Project::TYPE_ZERO);
         }elseif ($this->map['type'] == Project::TYPE_ONE){
         }elseif ($this->map['type'] == Project::TYPE_ONE){

@@ -61,10 +61,6 @@ class BTemplateLogic extends BaseLogic
             $this->fail('请先选择模版');
             $this->fail('请先选择模版');
         }
         }
         $TemplateInfo = [];
         $TemplateInfo = [];
-        $key = 'template_'.$this->user['project_id'].'_'.$this->param['source'].'_'.$this->param['source_id'];
-        if(!empty(Cache::get($key))){
-            $this->fail('当前页面正在装修中');
-        }
         if($this->param['source'] == $this->model::SOURCE_HOME){//首页
         if($this->param['source'] == $this->model::SOURCE_HOME){//首页
             $TemplateInfo = $this->homeHtml($info,$this->param['source'],$this->param['source_id']);
             $TemplateInfo = $this->homeHtml($info,$this->param['source'],$this->param['source_id']);
         }
         }

@@ -38,7 +38,15 @@ class Channel extends Model
         if(!$channel){
         if(!$channel){
             return [];
             return [];
         }
         }
-        $user = User::where('channel_id', $channel['id'])->where('name', $sales)->first();
+        $userModel = new User();
+        $user = $userModel->read(['name'=>$sales]);
+        if(!$user){
+            $data = [
+                'channel_id' => $channel['id'] ?? 0,
+                'name'=>$sales
+            ];
+            $user['id'] = $userModel->addReturnId($data);
+        }
         return [
         return [
             'zone_id' => $channel['zone_id'] ?? 0,
             'zone_id' => $channel['zone_id'] ?? 0,
             'channel_id' => $channel['id'] ?? 0,
             'channel_id' => $channel['id'] ?? 0,
@@ -49,7 +57,7 @@ class Channel extends Model
     public static function getChannelText($sales_id){
     public static function getChannelText($sales_id){
         $user = User::where('id', $sales_id)->select(['name', 'channel_id'])->first();
         $user = User::where('id', $sales_id)->select(['name', 'channel_id'])->first();
         if(!$user){
         if(!$user){
-            return '';
+            return $sales_id;
         }
         }
         $channel_alias = self::where('id', $user['channel_id'])->value('alias');
         $channel_alias = self::where('id', $user['channel_id'])->value('alias');
         return $channel_alias . '-' . $user['name'];
         return $channel_alias . '-' . $user['name'];

@@ -2,6 +2,7 @@
 
 
 namespace App\Models\Channel;
 namespace App\Models\Channel;
 
 
+use App\Models\Base;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Model;
 
 
 /**
 /**
@@ -10,7 +11,7 @@ use Illuminate\Database\Eloquent\Model;
  * @author zbj
  * @author zbj
  * @date 2023/6/27
  * @date 2023/6/27
  */
  */
-class User extends Model
+class User extends Base
 {
 {
     //设置关联表名
     //设置关联表名
     protected $table = 'gl_channel_user';
     protected $table = 'gl_channel_user';

@@ -89,7 +89,15 @@ class Project extends Base
             3 => '推广案例',
             3 => '推广案例',
             4 => '全球搜案例',
             4 => '全球搜案例',
             5 => '设计师案例',
             5 => '设计师案例',
-            6 => '可登陆后台'
+            6 => '可登陆后台',
+            7 => 'T项目',
+            8 => '特殊前后缀',
+            9 => '推广续费',
+            10 => '案例渠道',
+            11 => 'Ads',
+            12 => 'AI',
+            13 => 'AI站群',
+            14 => '未达标',
         ];
         ];
     }
     }