合并分支 'develop' 到 'master'

gx



查看合并请求 !499

@@ -138,6 +138,7 @@ class OptimizeController extends BaseController
         }
         }
         $item['product_num'] = $data['product'] ?? 0;
         $item['product_num'] = $data['product'] ?? 0;
         $item['keyword_num'] = $item['key'] ?? 0;
         $item['keyword_num'] = $item['key'] ?? 0;
+        $item['inquiry_num'] = $data['inquiry'] ?? 0;
         $item['autologin_code'] = getAutoLoginCode($item['id']);
         $item['autologin_code'] = getAutoLoginCode($item['id']);
         return $item;
         return $item;
     }
     }

@@ -10,9 +10,11 @@
 namespace App\Models\ASide;
 namespace App\Models\ASide;
 
 
 use App\Helper\AyrShare as AyrShareHelper;
 use App\Helper\AyrShare as AyrShareHelper;
+use App\Helper\FormGlobalsoApi;
 use App\Models\AyrShare\AyrShare as AyrShareModel;
 use App\Models\AyrShare\AyrShare as AyrShareModel;
 use App\Models\Base;
 use App\Models\Base;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
 
 
 class APublicModel extends Base
 class APublicModel extends Base
@@ -30,16 +32,28 @@ class APublicModel extends Base
      */
      */
     public static function getNumByProjectId($project_id){
     public static function getNumByProjectId($project_id){
         ProjectServer::useProject($project_id);
         ProjectServer::useProject($project_id);
-        $productNumber = DB::connection('custom_mysql')->table('gl_product')
-            ->where('project_id', $project_id)->where('status', self::STATUS_ON)->count();
-        $blogNumber = DB::connection('custom_mysql')->table('gl_blog')
-            ->where('project_id', $project_id)->where('status', self::STATUS_ON)->count();
-        $newsNumber = DB::connection('custom_mysql')->table('gl_news')
-            ->where('project_id', $project_id)->where('status', self::STATUS_ON)->count();
-        $keyNumber = DB::connection('custom_mysql')->table('gl_product_keyword')
-            ->where('project_id', $project_id)->where('status', self::STATUS_ON)->count();
+        $data = Cache::get('product_blog_news_'.$project_id);
+        if(!$data){
+            $productNumber = DB::connection('custom_mysql')->table('gl_product')
+                ->where('project_id', $project_id)->where('status', self::STATUS_ON)->count();
+            $blogNumber = DB::connection('custom_mysql')->table('gl_blog')
+                ->where('project_id', $project_id)->where('status', self::STATUS_ON)->count();
+            $newsNumber = DB::connection('custom_mysql')->table('gl_news')
+                ->where('project_id', $project_id)->where('status', self::STATUS_ON)->count();
+            $keyNumber = DB::connection('custom_mysql')->table('gl_product_keyword')
+                ->where('project_id', $project_id)->where('status', self::STATUS_ON)->count();
+            //获取项目的询盘数量
+            $inquiryNumber = 0;
+            $countInfo = DB::table('gl_count')->where('project_id', $project_id)->orderBy('id', 'desc')
+                ->first()->toArray();
+            if(!empty($countInfo)){
+                $inquiryNumber = $countInfo['inquiry_num'];
+            }
+            $data  = ['product'=>$productNumber,'blog'=>$blogNumber,'news'=>$newsNumber,'key'=>$keyNumber,'inquiry'=>$inquiryNumber];
+            Cache::add('product_blog_news_'.$project_id,$data,30 * 60);
+        }
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
-        return ['product'=>$productNumber,'blog'=>$blogNumber,'news'=>$newsNumber,'key'=>$keyNumber];
+        return $data;
     }
     }
 
 
 }
 }