Merge branch 'master' of e.coding.net:zdap/weixiu/weixiu_api into m--accessory_settlement

app/adminapi/logic/works/ServiceWorkLogic.php

@@ -22,6 +22,7 @@ use app\common\enum\ThirdTypeEnum;
 use app\common\enum\worker\WorkerAccountLogEnum;
 use app\common\logic\ThirdOrderLogic;
 use app\common\logic\WorkerAccountLogLogic;
+use app\common\model\external\ExternalPlatformOrders;
 use app\common\model\third\ThirdOrders;
 use app\common\model\works\ServiceWorkDeterminedPrice;
 use app\workerapi\logic\MasterWorkerLogic;
@@ -366,17 +367,15 @@ class ServiceWorkLogic extends BaseLogic
             $work->work_images = $params['work_images'];
             $work->explanation = $params['explanation']??'';
 
-            //判断是否是第三个订单，如果是美团订单直接滤过用户确认环节
-            if($work->third_type==1){
-                $work->work_status = 5;
-                $work->user_confirm_status = 2;
-            }else{
+            // 是否有三方的订单来源，若存在说明三方有系统 则自动确认报价
+            $platformOrders = ExternalPlatformOrders::where('work_id',$work->id)->findOrEmpty();
+            if($platformOrders->isEmpty()){
                 $work->user_confirm_status = 1;//待确认报价
-            }
-            if($work->external_platform_id > 0){
+            }else{
                 $work->work_status = 5;
                 $work->user_confirm_status = 2;
             }
+
             $work->price_approval = 0;
             $work->save();