1029 up

app/adminapi/controller/works/ReturnWorkController.php

@@ -127,11 +127,17 @@ class ReturnWorkController extends BaseAdminController
             ]);
             // 返修工程师预约上门通知【给工程师的通知】
             $returnWork = ReturnWorkLogic::detail(['issue_work_id'=>$params['issue_work_id']]);
+            $workDetail = ServiceWorkLogic::detail(['id'=>$issueWork['service_work_id']]);
             event('Notice',  [
-                'scene_id' => 123,
+                'scene_id' => 124,
                 'params' => [
                     'user_id' => $returnWork['master_worker_id'],
-                    'order_id' => $params['issue_work_id']
+                    'order_id' => $params['issue_work_id'],
+                    'thing2' => $issueWork['complaint_type_text'],
+                    'thing3' => $issueWork['complaint_details'],
+                    'thing4' => (iconv_strlen($workDetail['address'])>15)?(mb_substr($workDetail['address'],0,15,'UTF-8').'...'):$workDetail['address'],
+                    'phone_number6' => $issueWork['complaint_mobile'],
+                    'time17' => $returnWork['appointment_time'],
                 ]
             ]);
             return $this->success('成功', [], 1, 1);

app/adminapi/lists/master_worker/MasterWorkerLists.php

@@ -45,13 +45,24 @@ 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.audit_state'],
-            'in' => ['mw.time_period']
+            '=' => ['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', 'mw.work_status'],
+            //'in' => ['mw.time_period']
         ];
     }
 
     public function queryWhere(){
         $where = [];
+        if(isset($this->params['time_period']) && !empty($this->params['time_period'])){
+            $sqls = [];
+            foreach ($this->params['time_period'] as $item) {
+                $sqls[] = "FIND_IN_SET({$item}, time_period) > 0";
+            }
+            $query_sql = implode(' OR ', $sqls);
+            Log::write('query_sql:'.$query_sql);
+
+            $period_ids = MasterWorker::where('time_period','<>', '')->whereRaw($query_sql)->column('id');
+            $where[] = [ 'mw.id','IN',$period_ids?:[0]];
+        }
         // 用户昵称
         if (isset($this->params['nickname']) && !empty($this->params['nickname'])) {
             $where[] = ['mw.nickname|mw.worker_number', 'like','%' .$this->params['nickname'] . '%'];
@@ -73,10 +84,11 @@ class MasterWorkerLists extends BaseAdminDataLists implements ListsSearchInterfa
             $this->lon = $lon_lat['lon'];
             $this->lat = $lon_lat['lat'];
             $goods_category_id = $lon_lat['goods_category_id'];
+            // 派单搜索条件 - 工程师保护期  工程师可用金额限制(除去保护期工程师)  订单产品分类  订单坐标筛选(暂不按距离筛选只按距离排序)
+            $ids = DistributeLeafletsService::getIntersection($goods_category_id??0);
+            $where[] = [ 'mw.id','IN',$ids];
+            $where[] = [ 'mw.work_status','=',0];
         }
-        // 派单搜索条件 - 工程师保护期  工程师可用金额限制(除去保护期工程师)  订单产品分类  订单坐标筛选(暂不按距离筛选只按距离排序)
-        $ids = DistributeLeafletsService::getIntersection($goods_category_id??0);
-        $where[] = [ 'mw.id','IN',$ids];
         Log::debug('MasterWorker-where:'.json_encode($where));
         return $where;
     }
@@ -94,6 +106,7 @@ class MasterWorkerLists extends BaseAdminDataLists implements ListsSearchInterfa
         $fields = ['mw.*','mwr.maintain_exp_type','mwr.other_exp_type'];
         $orders = ['mw.id' => 'desc'];
         $queryWhere = $this->queryWhere();
+        //dd($queryWhere,$this->searchWhere);
         // 派单搜索条件 - 订单坐标距离排序
         if($this->lat && $this->lon){
             $fields[] = Db::raw('ROUND(6371* 1000 * ACOS(COS(RADIANS('.$this->lat.')) * COS(RADIANS(mw.lat)) * COS(RADIANS(mw.lon) - RADIANS('.$this->lon.')) + SIN(RADIANS('.$this->lat.')) * SIN(RADIANS(mw.lat))), 2) AS user_distance');

app/adminapi/lists/works/IssueWorkLists.php

@@ -78,7 +78,7 @@ class IssueWorkLists extends BaseAdminDataLists implements ListsSearchInterface
     {
         return IssueWork::with([
                 'masterWorker'=>function(Query $query){
-                    $query->field('id,real_name,worker_number,mobile');
+                    $query->field('id,real_name,worker_number,mobile,work_status');
                 },'admin'=>function(Query $query){
                     $query->field('id,name');
                 },'user'=>function(Query $query){

app/adminapi/lists/works/ServiceWorkLists.php

@@ -88,7 +88,7 @@ class ServiceWorkLists extends BaseAdminDataLists implements ListsSearchInterfac
             $ids[] = $goodsCategoryId;
             $where[] = ['goods_category_id','in' ,$ids];
         }
-        $where[] = ['work_pay_status','>',0];
+        //$where[] = ['work_pay_status','>',0];
         return $where;
     }
     /**

app/adminapi/logic/master_worker/MasterWorkerLogic.php

@@ -67,6 +67,7 @@ class MasterWorkerLogic extends BaseLogic
                 'distance' => $params['distance'],
                 'cooperation' => $params['cooperation']??0,
                 'time_period' => $params['time_period']??'',
+                'work_status' => $params['work_status']??0,
             ]);
 
             Db::commit();
@@ -127,7 +128,8 @@ class MasterWorkerLogic extends BaseLogic
                 'retention_money_status' => $params['retention_money_status'],
                 'category_ids' => $params['category_ids']??'',
                 'cooperation' => $params['cooperation']??0,
-                'time_period' => $params['time_period']??'',
+                'time_period' => $params['time_period']?implode(',',$params['time_period']):'',
+                'work_status' => $params['work_status']??0,
             ]);
             Db::commit();
             return true;
@@ -165,7 +167,9 @@ class MasterWorkerLogic extends BaseLogic
             $query->field('worker_id,real_name,id_card,id_card_front_img,id_card_opposite_img,mobile,address');
         },'workerRegister'=>function(Query $query){
             $query->field('worker_id,maintain_exp_type,other_exp_type,city,vehicle_type,name,age,mobile')->append(['maintain_exp_type_text','other_exp_type_text','vehicle_type_text','city_text']);
-        }])->findOrEmpty($params['id'])->toArray();
+        }])
+            ->append(['time_period'])
+            ->findOrEmpty($params['id'])->toArray();
         if(!empty($info['category_ids'])){
             $info['category_ids'] = explode(',',$info['category_ids']);
             $info['category_ids'] = array_map('intval', $info['category_ids']);

app/adminapi/logic/works/IssueWorkLogic.php

@@ -103,9 +103,9 @@ class IssueWorkLogic extends BaseLogic
                 'approval_time' => time(),
             ]);
 
-            // ******** 投诉- 非完成状态时工程师的质保金可用金额 被冻结 ********
+            // 投诉- 非完成状态时工程师的质保金可用金额 被冻结
             if($issueWork->is_refunded_payment == 0 && !in_array($issueWork->issue_approval,[5,4])){
-                if(RetentionMoneyLogic::warrantyDepositFreeze($issueWork,($returnModel->isEmpty()?0:$returnModel->id))){
+                if(RetentionMoneyLogic::warrantyDepositFreeze($issueWork)){
                     // 原工程师返修收成款是否被冻结 is_refunded_payment
                     $issueWork->is_refunded_payment = 1;
                     $issueWork->save();
@@ -119,7 +119,7 @@ class IssueWorkLogic extends BaseLogic
                     $is_zero = false;
                     // 查询出该投诉的冻结金额 master_worker_freeze_amount_log  issue_work_id master_worker_id
                     $amount = MasterWorkerFreezeAmountLog::where([
-                        'action'=>WorkerAccountLogEnum::INC,
+                        'action'=>WorkerAccountLogEnum::INC,'source'=>1,
                         'issue_work_id'=>$issueWork->id,'master_worker_id'=>$issueWork->master_worker_id])->value('amount');
 
                     // 是否存在返修工单？
@@ -139,18 +139,15 @@ class IssueWorkLogic extends BaseLogic
                             $is_zero = true;
                         }
                     }
-                    /*FreezeAmount              source remark return_work_id issue_work_id work_id amount worker_id retention_money_log_id
-                    RetentionMoney              to_freeze return_work_id source remark work_id amount  worker_id*/
+                    /*to_freeze source remark work_id amount  worker_id issue_work_id*/
                     // 对原工程师的 质保金解冻质保金 / 清零
                     RetentionMoneyLogic::warrantyDepositRelease([
+                        'to_freeze'=>2,
                         'source'=>1,
                         'remark'=>'对原工程师的质保金解冻质保金/清零',
-                        'to_freeze'=>2,
-                        'return_work_id'=>$work->id,
+                        'work_id'=>$work->service_work_id,'worker_id'=>$issueWork->master_worker_id,
                         'issue_work_id'=>$issueWork->id,
-                        'work_id'=>$work->service_work_id,
                         'amount'=>$amount,
-                        'worker_id'=>$issueWork->master_worker_id,
                     ],$is_zero);
                 }
             }
@@ -187,6 +184,6 @@ class IssueWorkLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return IssueWork::with(['masterWorker','user'])->findOrEmpty($params['id'])->toArray();
+        return IssueWork::with(['masterWorker','user'])->append(['complaint_type_text'])->findOrEmpty($params['id'])->toArray();
     }
 }

app/api/controller/ReturnWorkController.php

@@ -36,4 +36,16 @@ class ReturnWorkController extends BaseApiController
         }
         return $this->success('已确认服务完成', [], 1, 1);
     }
+
+    public function getWorkStatus()
+    {
+        $params = (new ReturnWorkValidate())->goCheck('detail',[
+            'user_id' => $this->userId,
+        ]);
+        $result = ReturnWorkLogic::detail($params);
+        if (empty($result)) {
+            return $this->fail('返修单不存在');
+        }
+        return $this->success('', ['return_work_status'=>$result['return_work_status']], 1, 1);
+    }
 }

app/common/logic/RetentionMoneyLogic.php

@@ -174,7 +174,8 @@ class RetentionMoneyLogic extends BaseLogic
         }
     }
 
-    // 扣除质保金可用额 (包括工单退款、冻结)
+    // 扣除质保金可用额 (包括工单直接退款、冻结)
+    // source remark issue_work_id work_id amount worker_id to_freeze
     public static function refundRetention($params,$to_freeze = true)
     {
         Db::startTrans();
@@ -191,17 +192,16 @@ class RetentionMoneyLogic extends BaseLogic
             $to_freeze && $masterWorkerInfo->earnest_money_freeze += $params['amount'];
             $masterWorkerInfo->save();
 
-            MasterWorkerRetentionMoneyLog::create([
+            $retentionMoneyLog = MasterWorkerRetentionMoneyLog::create([
                 'sn' => generate_sn(MasterWorkerRetentionMoneyLog::class,'sn'),
                 'worker_id' => $params['worker_id'],
                 'action' => WorkerAccountLogEnum::DEC,
                 'amount' => $params['amount'],
                 'work_id' => $params['work_id'],
                 'remark' => $params['remark'],
-                'source' => $params['source'],
                 'to_freeze' => isset($params['to_freeze'])?$params['to_freeze']:0,
-                'return_work_id' => isset($params['return_work_id'])?$params['return_work_id']:0,
             ]);
+            $retention_money_log_id = $retentionMoneyLog->id;
             // 记录冻结金额日志 - 增加
             if($to_freeze){
                 MasterWorkerFreezeAmountLog::create([
@@ -211,7 +211,7 @@ class RetentionMoneyLogic extends BaseLogic
                     'amount' => $params['amount'],
                     'work_id' => $params['work_id'],
                     'issue_work_id' => isset($params['issue_work_id'])?$params['issue_work_id']:0,
-                    'return_work_id' => isset($params['return_work_id'])?$params['return_work_id']:0,
+                    'retention_money_log_id' => $retention_money_log_id?:0,
                     'remark' => $params['remark'],
                     'source' => $params['source']
                 ]);
@@ -228,7 +228,7 @@ class RetentionMoneyLogic extends BaseLogic
 
 
     // 冻结投诉冻结质保金
-    public static function warrantyDepositFreeze($issueWork,$return_work_id = 0)
+    public static function warrantyDepositFreeze($issueWork)
     {
         Db::startTrans();
         try {
@@ -247,12 +247,15 @@ class RetentionMoneyLogic extends BaseLogic
 
                 // 总金额 = 退款金额 + 退质保金
                 $totalAmount = ($change_amount?:0) + ($retentionAmount?:0);
-                $remark = '工单号：'.$issueWork->work_sn.($return_work_id?'，返修单号：'.$return_work_id:'').'，退款总金额：'.$totalAmount.
+                $remark = '工单号：'.$issueWork->work_sn.'，退款总金额：'.$totalAmount.
                     '，应退余额：'.($change_amount?:0).
                     '，应退质保金：'.($retentionAmount?:0).
-                    '，退款原因：返修冻结';
-                self::refundRetention(['work_id'=>$issueWork->service_work_id,'worker_id'=>$issueWork->master_worker_id,
-                    'amount'=>$totalAmount,'remark'=>$remark,'return_work_id'=>$return_work_id,'to_freeze'=>1
+                    '，退款原因：投诉冻结';
+                self::refundRetention([
+                    'source'=>1,'remark'=>$remark,
+                    'issue_work_id' => $issueWork->id?:0,
+                    'work_id'=>$issueWork->service_work_id,'worker_id'=>$issueWork->master_worker_id,
+                    'amount'=>$totalAmount,'to_freeze'=>1
                 ]);
             }
 
@@ -268,36 +271,34 @@ class RetentionMoneyLogic extends BaseLogic
 
 
     // 解冻投诉冻结质保金
-    /*FreezeAmount              source remark return_work_id issue_work_id work_id amount worker_id retention_money_log_id
-    RetentionMoney              to_freeze return_work_id source remark work_id amount  worker_id*/
+    /* to_freeze source remark work_id amount  worker_id issue_work_id */
     public static function warrantyDepositRelease($params,$is_zero = false)
     {
         Db::startTrans();
         try {
             // $params['worker_id']
             $masterWorkerInfo = MasterWorker::where('id', $params['worker_id'])->findOrEmpty();
-
             $masterWorkerInfo->earnest_money_freeze -= $params['amount'];
             if($is_zero){
-                $retention_money_log_id = MasterWorkerFreezeAmountLog::where([
+                /*$retention_money_log_id = MasterWorkerFreezeAmountLog::where([
                     'action'=>WorkerAccountLogEnum::INC,
                     'issue_work_id'=>$params['issue_work_id'],'master_worker_id'=>$params['worker_id']])->value('retention_money_log_id');
-                MasterWorkerRetentionMoneyLog::where('id',$retention_money_log_id)->update(['to_freeze'=>2]);
+                MasterWorkerRetentionMoneyLog::where('id',$retention_money_log_id)->update(['to_freeze'=>2]);*/
+                $params['amount'] = 0;
             }else{
                 $masterWorkerInfo->earnest_money_usable += $params['amount'];
-                MasterWorkerRetentionMoneyLog::create([
-                    'sn' => generate_sn(MasterWorkerRetentionMoneyLog::class,'sn'),
-                    'worker_id' => $params['worker_id'],
-                    'action' => WorkerAccountLogEnum::INC,
-                    'amount' => $params['amount'],
-                    'work_id' => $params['work_id'],
-                    'remark' => $params['remark'],
-                    'source' => $params['source'],
-                    'to_freeze' => isset($params['to_freeze'])?$params['to_freeze']:0,
-                    'return_work_id' => isset($params['return_work_id'])?$params['return_work_id']:0,
-                ]);
             }
-
+            $retentionMoneyLog = MasterWorkerRetentionMoneyLog::create([
+                'sn' => generate_sn(MasterWorkerRetentionMoneyLog::class,'sn'),
+                'worker_id' => $params['worker_id'],
+                'action' => WorkerAccountLogEnum::INC,
+                'amount' => $params['amount'],
+                'work_id' => $params['work_id'],
+                'remark' => $params['remark'],
+                'source' => $params['source'],
+                'to_freeze' => 2,
+            ]);
+            $retention_money_log_id = $retentionMoneyLog->id;
             // 记录冻结金额日志 - 扣减
             MasterWorkerFreezeAmountLog::create([
                 'sn' => generate_sn(MasterWorkerFreezeAmountLog::class,'sn'),
@@ -305,9 +306,8 @@ class RetentionMoneyLogic extends BaseLogic
                 'action' => WorkerAccountLogEnum::DEC,
                 'amount' => $params['amount'],
                 'work_id' => $params['work_id'],
-                'retention_money_log_id' => isset($params['retention_money_log_id'])?$params['retention_money_log_id']:0,
+                'retention_money_log_id' => $retention_money_log_id?:0,
                 'issue_work_id' => isset($params['issue_work_id'])?$params['issue_work_id']:0,
-                'return_work_id' => isset($params['return_work_id'])?$params['return_work_id']:0,
                 'remark' => $params['remark'],
                 'source' => $params['source']
             ]);

app/common/model/master_worker/MasterWorker.php

@@ -85,7 +85,10 @@ class MasterWorker extends BaseModel
         $worker->save();
         return true;
     }
-
+    public function getTimePeriodAttr($value)
+    {
+        return explode(',',$value);
+    }
     public function getAvatarAttr($value)
     {
         return trim($value) ? FileService::getFileUrl($value) : '';

app/common/model/works/IssueWork.php

@@ -17,6 +17,7 @@ namespace app\common\model\works;
 
 use app\common\model\auth\Admin;
 use app\common\model\BaseModel;
+use app\common\model\dict\DictData;
 use app\common\model\master_worker\MasterWorker;
 use app\common\model\user\User;
 
@@ -74,7 +75,20 @@ class IssueWork extends BaseModel
     {
         return empty($value)?[]:json_decode($value,true);
     }
-
+    public function getComplaintTypeTextAttr($value, $data)
+    {
+        $complaint_type_data = DictData::where('type_value','complaint_type')->column('name','value');
+        if(is_array($data['complaint_type'])){
+            $complaint_types = $data['complaint_type'];
+        }else{
+            $complaint_types = json_decode($data['complaint_type'],true);
+        }
+        $complaint_type_text = [];
+        foreach ($complaint_types as $k=>$v){
+            $complaint_type_text[] = $complaint_type_data[$v];
+        }
+        return implode(',',$complaint_type_text);
+    }
     public function setComplaintTypeAttr($value)
     {
         return empty($value)?[]:json_encode($value,JSON_UNESCAPED_UNICODE);

app/workerapi/controller/LoginController.php

@@ -52,11 +52,13 @@ class LoginController extends BaseApiController
         }
         $result = LoginLogic::register($params);
         if (true === $result) {
-            // 发送通知给平台配置的审核人
+            // 发送通知给平台配置的审核人(公众号通知)
             event('Notice',  [
-                'scene_id' => NoticeEnum::WORKER_EXAMINE,
+                'scene_id' => 108,
                 'params' => [
                     'user_id' => 0,
+                    'thing1' => $params['name'],
+                    'time2' => date('Y-m-d H:i:s')
                 ]
             ]);
             // 工程师提交入驻申请后-发送短信通知
@@ -129,29 +131,4 @@ class LoginController extends BaseApiController
         LoginLogic::logout($this->userInfo);
         return $this->success();
     }
-    public function testWeChat()
-    {
-        try {
-            // 发送通知给平台配置的审核人
-            $noticeSetting = NoticeSetting::where('scene_id', NoticeEnum::WORKER_EXAMINE)->findOrEmpty()->toArray();
-            if($noticeSetting['oa_notice']['designated_user']??0 && $noticeSetting['oa_notice']['designated_user']){
-                (new WeChatOaService())->sendTemplateMessage([
-                    'scene_id' => NoticeEnum::WORKER_EXAMINE,
-                    'params' => [
-                        'user_id' => 0,
-                        'openid' => $noticeSetting['oa_notice']['designated_user'],
-                    ]
-                ]);
-                /*event('Notice',  [
-                    'scene_id' => NoticeEnum::WORKER_EXAMINE,
-                    'params' => [
-                        'user_id' => 0,
-                        'openid' => $noticeSetting['oa_notice']['designated_user'],
-                    ]
-                ]);*/
-            }
-        } catch (\Exception  $e) {
-            dd($e->getMessage());
-        }
-    }
 }

app/workerapi/controller/ReturnWorkController.php

@@ -70,4 +70,18 @@ class ReturnWorkController extends BaseApiController
         }
         return $this->success('操作成功,工程师已确认服务完成，等待用户确认中', [], 1, 1);
     }
+
+    public function getWorkStatus()
+    {
+        $params = (new ReturnWorkValidate())->goCheck('detail',[
+            'user_id' => $this->userId,
+        ]);
+        $result = ReturnWorkLogic::detail($params);
+        if (empty($result)) {
+            return $this->fail('返修单不存在');
+        }
+        return $this->success('', ['return_work_status'=>$result['return_work_status']], 1, 1);
+    }
+
+
 }

app/workerapi/lists/MasterWorkerRetentionMoneyLogLists.php

@@ -12,6 +12,26 @@ class MasterWorkerRetentionMoneyLogLists extends BaseWorkerDataLists
     public function queryWhere()
     {
         $where = [];
+        /*if(isset($this->params['action_freeze']) && !empty($this->params['action_freeze'])){
+            switch ($this->params['action_freeze']){
+                case 1:
+                    $where[] = ['action','=',1];
+                    $where[] = ['to_freeze','=',0];
+                    break;
+                case 2:
+                    $where[] = ['action','=',2];
+                    $where[] = ['to_freeze','=',0];
+                    break;
+                case 3:
+                    $where[] = ['to_freeze','=',1];
+                    break;
+                case 4:
+                    $where[] = ['to_freeze','=',2];
+                    break;
+                default:
+                    break;
+            }
+        }
         if(isset($this->params['worker_id'])){
            $where[]= ['worker_id','=',$this->params['worker_id']];
         } else{
@@ -27,7 +47,7 @@ class MasterWorkerRetentionMoneyLogLists extends BaseWorkerDataLists
             $firstTime = strtotime($firstDay);
             $lastTime = strtotime($lastDay);
             $where[] = ['create_time','between',[$firstTime,$lastTime]];
-        }
+        }*/
         return $where;
     }
 
@@ -36,12 +56,13 @@ class MasterWorkerRetentionMoneyLogLists extends BaseWorkerDataLists
         $lists = MasterWorkerRetentionMoneyLog::where($this->searchWhere)
             ->where($this->queryWhere())
             ->append(['action_text'])
-            ->field(['id', 'sn','action','amount','remark','work_id','create_time','update_time'])
+            ->field(['*'])
             ->order(['id' => 'desc'])
             ->select()
             ->toArray();
         foreach ($lists as &$item) {
             $item['amount'] = $item['action_text'] . $item['amount'];
+            $item['action_name'] = empty($item['to_freeze'])?($item['action']==1?'缴纳质保金':'扣除质保金'):($item['to_freeze']==1?'冻结质保金':'解冻质保金');
         }
         return $lists;
     }

app/workerapi/logic/MasterWorkerLogic.php

@@ -109,6 +109,7 @@ class MasterWorkerLogic extends  BaseLogic
                 throw new Exception('长期停单审核通过');
             }
             $user->work_status = 1;
+            $user->accept_order_status = 0;
             $user->save();
             return true;
         } catch (\Exception $e) {
@@ -160,6 +161,9 @@ class MasterWorkerLogic extends  BaseLogic
             ];
             if($params['field'] == 'accept_order_status'){
                 $masterWorker = MasterWorker::where(['id'=>$userId])->findOrEmpty();
+                if($masterWorker['work_status'] != 0 || $masterWorker['is_disable'] != 0){
+                    throw new Exception('该账号已禁用或已长期停单');
+                }
                 $accept_status_time = $masterWorker['accept_status_time'];
                 if($masterWorker['accept_order_status'] ==1 && $params['value'] == 0 && $accept_status_time > 0){
                     if(time() < ($accept_status_time+2*3600)){

config/database.php

@@ -52,7 +52,7 @@ return [
             // 是否需要断线重连
             'break_reconnect' => false,
             // 监听SQL
-            'trigger_sql'     => env('database.trigger_sql', false),
+            'trigger_sql'     => env('database.trigger_sql', true),
             // 开启字段缓存
             'fields_cache'    => false,
         ],

config/log.php

@@ -7,7 +7,7 @@ return [
     // 默认日志记录通道
     'default'      => env('log.channel', 'file'),
     // 日志记录级别
-    'level'        => ['info','notice','debug','error'],
+    'level'        => ['info','notice','debug','error','sql'],
     // 日志类型记录的通道 ['error'=>'email',...]
     'type_channel' => [],
     // 关闭全局日志写入
@@ -37,7 +37,7 @@ return [
             // 日志输出格式化
             'format'         => '[%s][%s] %s',
             // 是否实时写入
-            'realtime_write' => false,
+            'realtime_write' => true,
         ],
         // 其它日志通道配置
     ],