Merge branch 'master' into part_0504

app/adminapi/lists/sale/SaleCommissionLists.php

@@ -128,7 +128,7 @@ class SaleCommissionLists extends BaseAdminDataLists implements ListsSearchInter
             $item['group_counts'] = $group_counts[$item['id']]??0;
             $item['group_merits'] = $this->groupMerits($group_counts[$item['id']]??0);
 
-            $item['all_merits'] = $item['passes_merits'] + $item['property_merits'] + $item['group_merits'];
+            $item['all_merits'] = (float)$item['passes_merits'] + (float)$item['property_merits'] + (float)$item['group_merits'];
         }
         return $list;
     }
@@ -153,7 +153,7 @@ class SaleCommissionLists extends BaseAdminDataLists implements ListsSearchInter
         ];
         $data_fields = [function($row){ return $row['saleGroupInfo']['sale_name']??''; },'sale_name','mobile',
             'passes_counts','passes_merits','property_counts','property_merits','group_counts','group_merits','all_merits'
-            ,'start_date','end_date'
+            ,function($row){ return $row['start_date']?date('Y-m-d',$row['start_date']):''; },function($row){ return $row['end_date']?date('Y-m-d',$row['end_date']):''; }
         ];
         return [
             'zh_cn_fields' => $zh_cn_fields,
@@ -252,7 +252,7 @@ class SaleCommissionLists extends BaseAdminDataLists implements ListsSearchInter
 
     public function groupMerits($value)
     {
-        return $value;
+        return bcmul($value, 0.05,2);
     }
 
 

app/adminapi/lists/sale/SaleMasterWorkerLists.php

@@ -156,7 +156,7 @@ class SaleMasterWorkerLists extends BaseAdminDataLists implements ListsSearchInt
         $data_fields = [
             function($row){ return $row['sale']['sale_name']??''; },
             function($row){ return $row['sale']['saleGroupInfo']['sale_name']??''; },
-            'register_count','settled_count','start_date','end_date'
+            'register_count','settled_count',function($row){ return $row['start_date']?date('Y-m-d',$row['start_date']):''; },function($row){ return $row['end_date']?date('Y-m-d',$row['end_date']):''; }
         ];
         return [
             'zh_cn_fields' => $zh_cn_fields,

app/adminapi/logic/works/ServiceWorkLogic.php

@@ -1005,7 +1005,6 @@ class ServiceWorkLogic extends BaseLogic
             $work->dispatch_time = 0;
             $work->first_contact_time = 0;
             $work->estimated_finish_time = 0;
-            $work->exec_time = 0;
             $work->save();
 
             $work_log = [

app/common/command/AutomaticDispatch.php

@@ -10,6 +10,7 @@ use app\adminapi\service\WeCallService;
 use app\common\model\works\ServiceWork;
 use app\common\model\goods_time\GoodsTime;
 use app\common\model\master_worker\MasterWorker;
+use app\common\model\works\ServiceWorkAnomalous;
 use app\common\model\master_worker\MasterWorkerTeam;
 use app\common\model\works\ServiceWorkAllocateWorkerLog;
 use app\workerapi\logic\ServiceWorkerAllocateWorkerLogic;
@@ -53,6 +54,46 @@ class AutomaticDispatch extends Command
         if ($h >= 8 && $h <= 22) {
             $this->startTask();
         }
+
+        //异常工单：上门时间超过两小时状态未变更已上门
+        $this->workAnomalous();
+    }
+
+    /**
+     * 异常工单：上门时间超过两小时状态未变更已上门
+     */
+    protected function workAnomalous() 
+    {
+        $size = 100;
+        $startTime = time() - 7200;  // 当前时间减去7200秒（2小时）
+        $list = ServiceWork::alias("a")
+            ->leftJoin('service_work_anomalous b','a.id = b.work_id')
+            ->where('a.work_status',3)
+            ->where('a.service_status','<',2)
+            ->where('a.refund_approval',0)
+            ->where('a.work_pay_status',1)
+            ->where('a.appointment_time','<=', $startTime)
+            ->whereNull('b.id')
+            ->field('a.id,a.appointment_time,b.id as anomalous_id')
+            ->order('a.create_time','asc')
+            ->limit($size)
+            ->select()
+            ->toArray();
+        if (!$list) {
+            return ;
+        }
+
+        foreach($list as $item) {     
+            try {
+                ServiceWorkAnomalous::create([
+                    'work_id' => $item['id'],
+                    'reason_type' => 3,
+                    'reason' => '上门时间超过两小时状态未变更已上门',
+                ]);
+            } catch (\Exception $e) {
+                Log::write('异常工单:'.$e->getMessage());
+            }
+        }
     }
 
     /*
@@ -67,15 +108,11 @@ class AutomaticDispatch extends Command
         $startTime = strtotime(date('Y-m-d 00:00:00'));
         $endTime = strtotime(date('Y-m-d 23:59:59'));
        
-        // 获取当前时间的前五分钟时间戳
-        $fiveMinutesAgo = time() - 120; // 300 秒 = 2 分钟
         $list = ServiceWork::where('work_status',0)
             ->where('service_status',0)
             ->where('refund_approval',0)
             ->where('work_pay_status',1)
-            ->where(function ($query) use ($fiveMinutesAgo) {
-                $query->where('exec_time', 0)->whereOr('exec_time', '<', $fiveMinutesAgo);
-            })
+            ->where('exec_num','<', 2)
             ->where('appointment_time','between', [$startTime, $endTime])
             ->field('id,category_type,goods_category_id,service_area_id,lon,lat,province,city,title,appointment_time,address,mobile,work_sn')
             ->order('create_time','asc')
@@ -86,8 +123,6 @@ class AutomaticDispatch extends Command
             return ;
         }
 
-        $isExec = 1;//是否派单成功
- 
         foreach($list as $item) {     
             try {
                 //优先平台工程师派单
@@ -96,20 +131,21 @@ class AutomaticDispatch extends Command
                     //门店负责人派单
                     $res = $this->teamWorker($item);
                     if ($res === false) {
-                        $isExec = 0;
+                        ServiceWork::where('id',$item['id'])
+                            ->update([
+                                'exec_num' => 2,
+                            ]);
+                        ServiceWorkAnomalous::create([
+                            'work_id' => $item['id'],
+                            'reason_type' => 2,
+                            'reason' => '自动派单:找不到工程师',
+                        ]);
                     }
                 }
 
             } catch (\Exception $e) {
-                print_r($e->getMessage());
                 Log::write('自动派单异常:'.$e->getMessage());
             }
-
-            if ($isExec == 0) {
-                ServiceWork::where('id',$item['id'])->update([
-                    'exec_time' => time(),
-                ]);
-            }
         }
     }
 
@@ -353,7 +389,7 @@ class AutomaticDispatch extends Command
                 'work_status'=>1,
                 'estimated_finish_time' => $estimated_finish_time,
                 'dispatch_time'=>time(),
-                'exec_time' => time(),
+                'exec_num' => Db::raw('exec_num + 1'),
             ]);
             MasterWorker::setWorktotal('inc',$masterWorkerId);
             $work_log = [

app/common/command/CancelDispatch.php

@@ -7,6 +7,7 @@ use think\console\Output;
 use think\console\Command;
 use app\common\model\works\ServiceWork;
 use app\common\model\master_worker\MasterWorkerTeam;
+use app\common\model\works\ServiceWorkAnomalous;
 
 class CancelDispatch extends Command
 {
@@ -30,7 +31,7 @@ class CancelDispatch extends Command
         $list = ServiceWork::where('work_status',1)
                 ->where('dispatch_time','<',strtotime('-10 minutes'))
                 ->where('dispatch_time','>=',strtotime('-1 days'))
-                ->field('id,tenant_id,master_worker_id,appointment_time')
+                ->field('id,tenant_id,master_worker_id,appointment_time,exec_num')
                 ->limit(100)
                 ->select()
                 ->toArray();
@@ -43,12 +44,19 @@ class CancelDispatch extends Command
                             'dispatch_time' => 0,
                             'first_contact_time' => 0,
                             'estimated_finish_time' => 0,
-                            'exec_time' => 0,
                         ]);
             if ($item['tenant_id'] > 0) {
                 $updateData = date("H",strtotime($item['appointment_time'])) < 12 ? ['am_order' => Db::raw('am_order - 1')] : ['pm_order' => Db::raw('pm_order - 1')];
                 MasterWorkerTeam::where('master_worker_id',$item['master_worker_id'])->where('tenant_id',$item['tenant_id'])->update($updateData);
-                
+            }
+
+            //自动派单2次后，标记工单异常
+            if ($item['exec_num'] >= 2) {
+                ServiceWorkAnomalous::create([
+                    'work_id' => $item['id'],
+                    'reason_type' => 2,
+                    'reason' => '自动派单:2次无人接单',
+                ]);
             }
         }