gx

@@ -43,53 +43,104 @@ class ShareUser extends Command
     protected function user_operator_record(){
         //获取所有ayr_share用户
         $ayr_share_model = new AyrShareModel();
-        $ayr_share_list = $ayr_share_model->list();
-        foreach ($ayr_share_list as $k => $v){
+        $ayr_share_list = $ayr_share_model->list(['profile_key'=>['!=','']]);
+        foreach ($ayr_share_list as $v){
             $time = Carbon::now()->modify('-7 days')->toDateString();
             //创建时间小于7天前的当前时间
             if($v['created_at'] > $time){
                 continue;
             }
-            //查询当前用户是否有未推送的博文
             $ayr_release = new AyrReleaseModel();
-            $release_info = $ayr_release->read(['schedule_date'=>['>',date('Y-m-d H:i:s',time())],'share_id'=>$v['id']]);
+            //查询当前用户是否有未推送的博文
+            $release_info = $this->release_info($ayr_release,$v);
             //有推文时,直接跳出循环
             if($release_info !== false){
                 continue;
             }
-            //查看用户是否在一周内有发送博客
-            $start_at = Carbon::now()->modify('-7 days')->toDateString();
-            $end_at = Carbon::now()->toDateString();
-            $release_info = $ayr_release->read(['created_at'=>['between',[$start_at,$end_at]]]);
+            //查询7天是否发送博文
+            $release_info = $this->release_seven_info($ayr_release);
             //有发送博文，则跳出循环
             if($release_info  !== false){
                 continue;
             }
             //删除用户第三方配置
             if(!empty($v['profile_key'])){
-                $ayr_share_helper = new AyrShareHelper();
-                $data_profiles = [
-                    'title'=>$v['title'],
-                    'profileKey'=>$v['profile_key']
-                ];
-                $res = $ayr_share_helper->deleted_profiles($data_profiles);
-                if($res['status'] == 'fail'){
-                    $this->error++;
-                    continue;
-                }
+                $this->del_profiles($v);
+                continue;
             }
             //更新数据库
-            $data = [
-                'title'=>'',
-                'bind_platforms'=>'',
-                'profile_key'=>'',
-                'ref_id'=>'',
-            ];
-            $res = $ayr_share_model->edit($data,['id'=>$v['id']]);
-            if($res == false){
-                $this->error++;
-            }
+            $this->save_ayr_share($ayr_share_model,$v);
+        }
+        return true;
+    }
+
+    /**
+     * @name   :(删除第三方配置)del_profiles
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/14 16:10
+     */
+    public function del_profiles($v){
+        $ayr_share_helper = new AyrShareHelper();
+        $data_profiles = [
+            'title'=>$v['title'],
+            'profileKey'=>$v['profile_key']
+        ];
+        $res = $ayr_share_helper->deleted_profiles($data_profiles);
+        if($res['status'] == 'fail'){
+            echo $this->error++ . '|' .'第三方删除失败';
+            return true;
         }
-        return $this->error;
+        return true;
+    }
+
+    /**
+     * @name   :(更新数据库)save_ayr_share
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/14 16:14
+     */
+    public function save_ayr_share(&$ayr_share_model,$v){
+
+        //更新数据库
+        $data = [
+            'title'=>'',
+            'bind_platforms'=>'',
+            'profile_key'=>'',
+            'ref_id'=>'',
+        ];
+        $res = $ayr_share_model->edit($data,['id'=>$v['id']]);
+        if($res == false){
+            echo $this->error++ . '|' .'第三方删除失败';
+            return true;
+        }
+        return true;
+    }
+
+    /**
+     * @name   :(查询是否有定时发送报文)info
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/14 16:17
+     */
+    public function release_info(&$ayr_release,$v){
+        //查询当前用户是否有未推送的博文
+        $release_info = $ayr_release->read(['schedule_date'=>['>',date('Y-m-d H:i:s',time())],'share_id'=>$v['id']]);
+        return $release_info;
+    }
+
+    /**
+     * @param $ayr_release
+     * @name   :(7天内无发送记录)release_seven_info
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/14 16:28
+     */
+    public function release_seven_info(&$ayr_release){
+        //查看用户是否在一周内有发送博客
+        $start_at = Carbon::now()->modify('-7 days')->toDateString();
+        $end_at = Carbon::now()->toDateString();
+        $release_info = $ayr_release->read(['created_at'=>['between',[$start_at,$end_at]]]);
+        return $release_info;
     }
 }