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

@@ -65,9 +65,9 @@ class UpgradeProjectCount extends Command
             ->groupBy('month')->get()->toArray();
             ->groupBy('month')->get()->toArray();
         foreach ($list as $k=>$v){
         foreach ($list as $k=>$v){
             $v = (array)$v;
             $v = (array)$v;
-            if($v['month'] == date('Y-m')){
-                continue;
-            }
+//            if($v['month'] == date('Y-m')){
+//                continue;
+//            }
             $monthCountModel = new MonthCount();
             $monthCountModel = new MonthCount();
             $info = $monthCountModel->read(['month'=>$v['month'],'project_id'=>$project_id]);
             $info = $monthCountModel->read(['month'=>$v['month'],'project_id'=>$project_id]);
             // 获取当月开始时间
             // 获取当月开始时间

@@ -115,6 +115,8 @@ class RecommendedSuppliers extends Command
      * @time   :2024/7/1 18:07
      * @time   :2024/7/1 18:07
      */
      */
     public function getKeywords($project_id){
     public function getKeywords($project_id){
+        $keywordModel = new Keyword();
+        $keywordModel->
         $info = Keyword::inRandomOrder()->first();
         $info = Keyword::inRandomOrder()->first();
         $keywordInfo = $this->getPurchaser($info->title,$project_id);
         $keywordInfo = $this->getPurchaser($info->title,$project_id);
         if($keywordInfo !== false){
         if($keywordInfo !== false){

@@ -312,13 +312,13 @@ class ComController extends BaseController
     public function getMobileProject(){
     public function getMobileProject(){
         $data = [];
         $data = [];
         $userModel = new User();
         $userModel = new User();
-        $list = $userModel->list(['mobile'=>$this->user['mobile'],'project_id'=>['!=',$this->user['project_id']]],'id',['id','project_id']);
-        if(!empty($list)){
+        $project_id = $userModel->formatQuery(['mobile'=>$this->user['mobile'],'project_id'=>['!=',$this->user['project_id']]])->pluck('project_id')->toArray();
+        if(!empty($project_id)){
             $projectModel = new Project();
             $projectModel = new Project();
-            foreach ($list as $k => $v){
-                $projectInfo = $projectModel->read(['id'=>$v['project_id']],['id','company']);
+            $list = $projectModel->list(['id'=>['in',$project_id],'delete_status'=>0],'id',['id','company']);
+            foreach ($list as $v){
                 //获取当前项目详情
                 //获取当前项目详情
-                $data[] = ['project_id'=>$projectInfo['id'],'company'=>$projectInfo['company']];
+                $data[] = ['project_id'=>$v['id'],'company'=>$v['company']];
             }
             }
         }
         }
         //登录选择项目的有效时间
         //登录选择项目的有效时间

@@ -7,6 +7,7 @@ use App\Helper\Arr;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Product\KeywordLogic;
 use App\Http\Logic\Bside\Product\KeywordLogic;
 use App\Http\Requests\Bside\Product\KeywordRequest;
 use App\Http\Requests\Bside\Product\KeywordRequest;
+use App\Models\Com\NoticeLog;
 use App\Models\Product\Keyword;
 use App\Models\Product\Keyword;
 use App\Models\Product\KeywordRelated;
 use App\Models\Product\KeywordRelated;
 use App\Models\Product\Product;
 use App\Models\Product\Product;
@@ -232,4 +233,15 @@ class KeywordController extends BaseController
         }
         }
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * @remark :批量提交更新关键词
+     * @name   :batchUpdateKeyword
+     * @author :lyh
+     * @method :post
+     * @time   :2024/7/2 10:14
+     */
+    public function batchUpdateKeyword(){
+        $noticeLogModel = new NoticeLog();
+    }
 }
 }