后台、接口 修改

app/adminapi/controller/works/ServiceWorkController.php

@@ -89,6 +89,7 @@ class ServiceWorkController extends BaseAdminController
                     'scene_id' => 118,
                     'params' => [
                         'user_id' => $workDetail['master_worker_id'],
+                        'order_id' => $workDetail['id'],
                         'thing4' => $workDetail['title'],
                         'time5' => $workDetail['appointment_time'],
                         'time6' => $params['appointment_time'],

app/adminapi/lists/master_worker/MasterWorkerExamineLists.php

@@ -45,11 +45,15 @@ class MasterWorkerExamineLists extends BaseAdminDataLists implements ListsSearch
     }
     public function queryWhere(){
         $where = [];
-        $infoWorkerIds = MasterWorkerInfo::where('audit_state',0)->column('worker_id');
+        if(isset($this->params['audit_state']) && $this->params['audit_state']!=''){
+            $ids = MasterWorker::where('audit_state',$this->params['audit_state'])->column('id');
+            $where[] = ['id', 'IN', $ids?:[0]];
+            //dd($ids);
+        }
+        /*$infoWorkerIds = MasterWorkerInfo::where('audit_state',0)->column('worker_id');
         $bankWorkerIds = BankAccount::where('audit_state',0)->column('worker_id');
         $agreeWorkerIds = MasterWorkerAgree::where('audit_state',0)->column('worker_id');
-        $ids = array_merge($infoWorkerIds,$bankWorkerIds,$agreeWorkerIds);
-        $where[] = ['id', 'IN', $ids?:[0]];
+        $ids = array_merge($infoWorkerIds,$bankWorkerIds,$agreeWorkerIds);*/
         if(isset($this->params['real_name']) && !empty($this->params['real_name'])){
             $where[] = ['id', 'IN', MasterWorker::where([['real_name', 'like', "%{$this->params['real_name']}%"]])->column('worker_id')?:[0]];
         }

app/adminapi/lists/master_worker/MasterWorkerLists.php

@@ -45,8 +45,8 @@ class MasterWorkerLists extends BaseAdminDataLists implements ListsSearchInterfa
     {
         // 派单搜索条件 - 工程师接单状态
         return [
-            '=' => ['mw.sn', 'mw.real_name', 'mw.account', 'mw.password', 'mw.mobile', 'mw.sex', 'mw.channel', 'mw.is_disable', 'mw.is_new_user', 'mw.create_time', 'mw.update_time', 'mw.accept_order_status', 'mw.cooperation', 'mw.time_period','mw.audit_state'],
-
+            '=' => ['mw.sn', 'mw.real_name', 'mw.account', 'mw.password', 'mw.mobile', 'mw.sex', 'mw.channel', 'mw.is_disable', 'mw.is_new_user', 'mw.create_time', 'mw.update_time', 'mw.accept_order_status', 'mw.cooperation','mw.audit_state'],
+            'in' => ['mw.time_period']
         ];
     }
 

app/adminapi/logic/master_worker/MasterWorkerExamineLogic.php

@@ -71,17 +71,17 @@ class MasterWorkerExamineLogic extends BaseLogic
     {
         Db::startTrans();
         try {
-            isset($params['workerInfo']['id']) && MasterWorkerInfo::where('id', $params['workerInfo']['id'])->update([
+            !empty($params['workerInfo']['id']) && MasterWorkerInfo::where('id', $params['workerInfo']['id'])->update([
                 'audit_state' => $params['workerInfo']['audit_state'],
             ]);
-            isset($params['workerAgree']['id']) && MasterWorkerAgree::where('id', $params['workerAgree']['id'])->update([
+            !empty($params['workerAgree']['id']) && MasterWorkerAgree::where('id', $params['workerAgree']['id'])->update([
                 'audit_state' => $params['workerAgree']['audit_state'],
             ]);
-            isset($params['bankAccount']['id']) && BankAccount::where('id', $params['bankAccount']['id'])->update([
+            !empty($params['bankAccount']['id']) && BankAccount::where('id', $params['bankAccount']['id'])->update([
                 'audit_state' => $params['bankAccount']['audit_state'],
             ]);
 
-            if(!isset($params['workerInfo']['id']) || !isset($params['workerAgree']['id']) || !isset($params['bankAccount']['id'])) {
+            if(empty($params['workerInfo']['id']) || empty($params['workerAgree']['id']) || empty($params['bankAccount']['id'])) {
                 $audit_state = 3;
             }elseif ((int)$params['workerInfo']['audit_state'] === 0 || (int)$params['workerAgree']['audit_state'] === 0 || (int)$params['bankAccount']['audit_state'] === 0){
                 $audit_state = 0;

app/api/controller/ServiceOrderController.php

@@ -255,6 +255,7 @@ class ServiceOrderController extends BaseApiController
             'scene_id' => 118,
             'params' => [
                 'user_id' => $result['master_worker_id'],
+                'order_id' => $order['work_id'],
                 'thing4' => $result['title'],
                 'time5' => date('Y-m-d H:i:s',$workDetail['last_appointment_time']),
                 'time6' => date('Y-m-d H:i:s',$workDetail['this_appointment_time']),

app/common/logic/NoticeLogic.php

@@ -159,6 +159,8 @@ class NoticeLogic extends BaseLogic
         $page = '';
         switch (intval($sceneId)) {
             case 113:
+            case 118:
+            //case 100:
                 $page = "/subPages/detail/detail?id={$extraId}";
                 break;
             case 116:

app/common/service/pay/WeChatPayService.php

@@ -400,6 +400,7 @@ class WeChatPayService extends BasePayService
                                         'scene_id' => 100,
                                         'params' => [
                                             'user_id' => 0,
+                                            'order_id' => $workDetail['id'],
                                             'thing3' => $workDetail['title'],
                                             'time6' => $workDetail['appointment_time'],
                                             'phone_number8' => $workDetail['mobile'],

app/workerapi/controller/WorksController.php

@@ -155,6 +155,7 @@ class WorksController extends BaseApiController
             'scene_id' => 116,
             'params' => [
                 'user_id' => $workDetail['master_worker_id'],
+                'order_id' => $workDetail['id'],
                 'thing5' => $workDetail['title'],
                 'time10' => $workDetail['appointment_time'],
                 'thing3' => (iconv_strlen($workDetail['address'])>15)?(mb_substr($workDetail['address'],0,15,'UTF-8').'...'):$workDetail['address'],