up

app/workerapi/logic/MasterWorkerLogic.php

@@ -248,11 +248,14 @@ class MasterWorkerLogic extends  BaseLogic
             if($item['is_must']){
                 Log::info('taskRequired-1'.json_encode($item));
                 if(empty($item['execute_function'])) continue;
-                $service = (new MasterWokerTaskRequiredService());
-                if(!method_exists($service,$item['execute_function'])){
+                if(!class_exists(\app\workerapi\service\MasterWokerTaskRequiredService::class)){
                     continue;
                 }
-                $res = $service->$item['execute_function']($userId);
+                if(!method_exists(\app\workerapi\service\MasterWokerTaskRequiredService::class,$item['execute_function'])){
+                    continue;
+                }
+                $execute_function = $item['execute_function'];
+                $res = (new MasterWokerTaskRequiredService())::$execute_function($userId);
                 Log::info('taskRequired-2:'.$userId.'-'.$item['execute_function'].'-'.$res);
                 if($res === false){
                     return false;

app/workerapi/service/MasterWokerTaskRequiredService.php

@@ -13,48 +13,48 @@ class MasterWokerTaskRequiredService
 {
 
 
-    public function learningStatus($userId) : bool
+    public static function learningStatus($userId) : bool
     {
         return (bool)TrainingWorkerTask::where('master_worker_id', $userId)->value('shop_orders_id');
     }
 
-    public function trainingTask($userId): bool
+    public static function trainingTask($userId): bool
     {
         return TrainingWorkerTask::where('master_worker_id', $userId)->value('training_status')==2;
     }
 
-    public function operateStatus($userId): bool
+    public static function operateStatus($userId): bool
     {
         return TrainingWorkerTask::where('master_worker_id', $userId)->value('operate_status')==1;
     }
-    public function bankStatus($userId): bool
+    public static function bankStatus($userId): bool
     {
         return (bool)BankAccount::where('worker_id',$userId)->where('audit_state',1)->value('id');
     }
-    public function categoryStatus($userId): bool
+    public static function categoryStatus($userId): bool
     {
         return (bool)MasterWorker::where('id',$userId)->value('category_ids');
     }
-    public function serviceStatus($userId): bool
+    public static function serviceStatus($userId): bool
     {
         $masterWorker = MasterWorker::where('id',$userId)->find();
         return !((empty($masterWorker['lon']) || empty($masterWorker['lat'])));
     }
-    public function tenantRegisterStatus($userId): bool
+    public static function tenantRegisterStatus($userId): bool
     {
         $masterWorker = MasterWorker::where('id',$userId)->find();
         return (bool)TenantRegister::where('mobile', $masterWorker['mobile'])->value('status');
     }
-    public function tenantAgreeStatus($userId): bool
+    public static function tenantAgreeStatus($userId): bool
     {
         return (bool)TenantAgree::where('worker_id',$userId)->where('audit_state',1)->value('id');
     }
 
-    public function harmlessAgreeStatus($userId): bool
+    public static function harmlessAgreeStatus($userId): bool
     {
         return (bool)MasterWorkerAgree::where(['agree_type'=>'harmless_content','worker_id'=>$userId,'audit_state'=>1])->value('id');
     }
-    public function crimeAgreeStatus($userId): bool
+    public static function crimeAgreeStatus($userId): bool
     {
         return (bool)MasterWorkerAgree::where(['agree_type'=>'crime_content','worker_id'=>$userId,'audit_state'=>1])->value('id');
     }