Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

lyh
app/Console/Commands/DayCount/UpgradeProjectCount.php
app/Console/Commands/Update/ProjectUpdate.php
app/Http/Controllers/Html/UpdateHtml.php
app/Http/Logic/Aside/Project/ProjectLogic.php
--- a/app/Console/Commands/DayCount/UpgradeProjectCount.php
查看文件 @1ae6cbf
+++ b/app/Console/Commands/DayCount/UpgradeProjectCount.php
查看文件 @1ae6cbf
@@ -23,7 +23,7 @@ class UpgradeProjectCount extends Command
      *
      * @var string
      */
-    protected $signature = 'upgrade_count';
+    protected $signature = 'upgrade_count {project_id}';
     /**
      * The console command description.
@@ -33,7 +33,7 @@ class UpgradeProjectCount extends Command
     protected $description = '升级项目统计';
     public function handle(){
-        $project_id = 769;
+        $project_id = $this->argument('project_id');
         ProjectServer::useProject($project_id);
         $this->count($project_id);
         DB::disconnect('custom_mysql');
@@ -100,7 +100,8 @@ class UpgradeProjectCount extends Command
      * @time   :2023/6/14 15:40
      */
     public function pv_num($day){
-        $pv = DB::connection('custom_mysql')->table('gl_customer_visit_item')->whereDate('updated_date', $day)->count();
+        //$pv = DB::connection('custom_mysql')->table('gl_customer_visit_item')->whereDate('updated_date', $day)->count();
+		$pv = DB::connection('custom_mysql')->table('gl_customer_visit')->whereDate('updated_date', $day)->sum('depth');
         return $pv;
     }
--- a/app/Console/Commands/Update/ProjectUpdate.php
查看文件 @1ae6cbf
+++ b/app/Console/Commands/Update/ProjectUpdate.php
查看文件 @1ae6cbf
@@ -122,7 +122,7 @@ class ProjectUpdate extends Command
                 $data = curl_c($url);
                 if (isset($data['code']) && $data['code'] == 200) {
                     $items = $data['data'] ?? [];
-                    $this->category_insert($project_id, $items, 0);
+                    $this->category_insert($project_id, $items, 0, $domain_arr['host'], $web_url_domain, $home_url);
                 } else {
                     return true;
                 }
@@ -737,7 +737,7 @@ class ProjectUpdate extends Command
     }
     //产品多级分类入库
-    protected function category_insert($project_id, $items, $pid = 0)
+    protected function category_insert($project_id, $items, $pid, $domain, $web_url_domain, $home_url)
     {
         $model = new Category();
         foreach ($items as $item) {
@@ -747,9 +747,17 @@ class ProjectUpdate extends Command
                 if (!$parent) {
                     try {
                         $item['name'] = $this->special2str($item['name'] ?? '');
+                        //图片
+                        if (is_array($item['images'] ?? '')) {
+                            $image = $item['images'][0] ?? '';
+                        } else {
+                            $image = $item['images'] ?? '';
+                        }
+                        $new_img = $this->source_download($image, $project_id, $domain, $web_url_domain, $home_url);
                         $parent_id = $model->addReturnId([
                             'project_id' => $project_id,
                             'title' => $item['name'],
+                            'image' => $new_img,
                             'pid' => $pid,
                             'keywords' => $item['keywords'] ?? '',
                             'describe' => $item['description'] ?? '',
@@ -766,7 +774,7 @@ class ProjectUpdate extends Command
                 }
                 if (!empty($item['children'] ?? [])) {
-                    $this->category_insert($project_id, $item['children'], $parent_id);
+                    $this->category_insert($project_id, $item['children'], $parent_id, $domain, $web_url_domain, $home_url);
                 }
             }
         }
--- a/app/Http/Controllers/Html/UpdateHtml.php
查看文件 @1ae6cbf
+++ b/app/Http/Controllers/Html/UpdateHtml.php
查看文件 @1ae6cbf
@@ -11,6 +11,7 @@ namespace App\Http\Controllers\Html;
 use App\Http\Controllers\Controller;
 use App\Models\Com\NoticeLog;
+use App\Models\CustomModule\CustomModule;
 use App\Models\Project\Project;
 use App\Models\RouteMap\RouteMap;
 use App\Models\Service\Service as ServiceSettingModel;
@@ -53,12 +54,27 @@ class UpdateHtml extends Controller
      * @method :post
      * @time   :2024/2/2 11:03
      */
-    public function getPageHtmlIsCustomized($source,$is_list){
-        $type = $this->getCustomizedType($source, $is_list);//获取定制界面类型
-        //查看当前页面是否定制，是否开启可视化
-        $page_array = (array)$this->user['is_visualization']->page_array;//获取所有定制界面
-        if (in_array($type, $page_array)) {//是定制界面
-            return BTemplate::IS_VISUALIZATION;
+    public function getPageHtmlIsCustomized($source,$is_list,$is_custom){
+        if($is_custom == BTemplate::IS_CUSTOM){
+            $customModuleModel = new CustomModule();
+            $info = $customModuleModel->read(['id'=>$source]);
+            if($info === false){
+                $this->fail('当前扩展模块不存在或已被删除');
+            }
+            //扩展模块定制
+            if($is_list == BTemplate::IS_LIST && $info['list_customized'] == BTemplate::IS_VISUALIZATION){
+                return BTemplate::IS_VISUALIZATION;
+            }
+            if($is_list == BTemplate::IS_DETAIL && $info['detail_customized'] == BTemplate::IS_VISUALIZATION){
+                return BTemplate::IS_VISUALIZATION;
+            }
+        }else{
+            $type = $this->getCustomizedType($source, $is_list);//获取定制界面类型
+            //查看当前页面是否定制，是否开启可视化
+            $page_array = (array)$this->user['is_visualization']->page_array;//获取所有定制界面
+            if (in_array($type, $page_array)) {//是定制界面
+                return BTemplate::IS_VISUALIZATION;
+            }
         }
         return BTemplate::IS_NO_VISUALIZATION;
     }
@@ -120,4 +136,37 @@ class UpdateHtml extends Controller
         }
         return $html;
     }
+
+    /**
+     * @remark :定制页面头部类型---根据source获取type类型
+     * @name   :getType
+     * @author :lyh
+     * @method :post
+     * @time   :2023/11/16 11:20
+     */
+    public function getCustomizedType($source,$is_list){
+        $type = BTemplate::TYPE_HOME;
+        if($source == BTemplate::SOURCE_PRODUCT){
+            if($is_list == BTemplate::IS_LIST){
+                $type = BTemplate::TYPE_PRODUCT_LIST;
+            }else{
+                $type = BTemplate::TYPE_PRODUCT_DETAIL;
+            }
+        }
+        if($source == BTemplate::SOURCE_BLOG){
+            if($is_list == BTemplate::IS_LIST){
+                $type = BTemplate::TYPE_BLOG_LIST;
+            }else{
+                $type = BTemplate::TYPE_BLOG_DETAIL;
+            }
+        }
+        if($source == BTemplate::SOURCE_NEWS){
+            if($is_list == BTemplate::IS_LIST){
+                $type = BTemplate::TYPE_NEWS_LIST;
+            }else{
+                $type = BTemplate::TYPE_NEWS_DETAIL;
+            }
+        }
+        return $type;
+    }
 }
--- a/app/Http/Logic/Aside/Project/ProjectLogic.php
查看文件 @1ae6cbf
+++ b/app/Http/Logic/Aside/Project/ProjectLogic.php
查看文件 @1ae6cbf
@@ -156,13 +156,14 @@ class ProjectLogic extends BaseLogic
                 $this->syncImageFile($this->param['project_location'],$this->param['id']);
                 //创建站点
 //                $this->createSite($this->param);
+                (new SyncService())->projectAcceptAddress($this->param['id']);
             }
             DB::commit();
         }catch (\Exception $e){
             DB::rollBack();
             $this->fail('保存失败，请联系管理员');
         }
-        (new SyncService())->projectAcceptAddress($this->param['id']);
+
         return $this->success();
     }
@@ -373,7 +374,7 @@ class ProjectLogic extends BaseLogic
                 'company' => $param['company'],
                 'lead_name' => $param['lead_name'],
                 'mobile' => $param['mobile'],
-                'qq' => $param['qq'],
+                'qq' => $param['qq'] ?? '',
                 'channel' => json_encode($param['channel']),
                 'requirement' => $param['requirement'],
                 'cooperate_date' => $param['cooperate_date'],