师傅端-用户确认服务完成

app/api/controller/ServiceOrderController.php

@@ -102,6 +102,6 @@ class ServiceOrderController extends BaseApiController
         if (false === $result) {
             return $this->fail(ServiceOrderLogic::getError());
         }
-        return $this->success('已确认报价，师傅即将开始服务', [], 1, 1);
+        return $this->success('已确认服务完成', [], 1, 1);
     }
 }

app/api/logic/ServiceOrderLogic.php

@@ -153,11 +153,12 @@ class ServiceOrderLogic extends BaseLogic
                 $order_info['master_worker']['real_name'] = $worker['real_name'];
                 $order_info['master_worker']['worker_number'] = $worker['worker_number'];
                 $order_info['master_worker']['mobile'] = $worker['mobile'];
-                $order_info['master_worker']['worker_exp'] = DictData::where(['type_value'=>'worker_exp_type','value'=>$worker->worker_register->maintain_exp_type])->value('name');
+                $maintain_exp_type = !empty($worker->worker_register->maintain_exp_type)?$worker->worker_register->maintain_exp_type:'';
+                $order_info['master_worker']['worker_exp'] = DictData::where(['type_value'=>'worker_exp_type','value'=>$maintain_exp_type])->value('name');
             }
-
             //搜索当前工单下的所有订单记录
             $order_info['pay_orders'] = \app\common\model\recharge\RechargeOrder::where(['work_id'=>$order_info['work_id']])->field('id as order_id, pay_status,payment_type,pay_way,pay_time,order_amount')->order('id asc')->select()->toArray();
+
             $pay_status_data = DictData::where('type_value','pay_status')->column('name','value');
             $payment_type_data = DictData::where('type_value','payment_type')->column('name','value');
             $pay_way_data = DictData::where('type_value','pay_way')->column('name','value');
@@ -278,8 +279,17 @@ class ServiceOrderLogic extends BaseLogic
             if($service_work->user_confirm_status!=3){
                 throw new Exception('请勿重复操作');
             }
-            $service_work->work_status = 6;
-            $service_work->user_confirm_status = 4;
+
+            $orders = RechargeOrder::where(['work_id'=>$work_id,'user_id'=>$params['user_id']])->select()->toArray();
+
+            //若订单是全款已支付订单
+            if(count($orders)==1 and $orders[0]['payment_type']=0 and $orders[0]['pay_status']==1){
+                $service_work->work_status = 7;// todo 已完结---调用师傅金额结算端口
+                $service_work->user_confirm_status = 5;
+            }else{
+                $service_work->work_status = 6;
+                $service_work->user_confirm_status = 4;
+            }
             $service_work->save();
 
             $work_log = [

app/common/model/works/ServiceWork.php

@@ -36,7 +36,7 @@ class ServiceWork extends BaseModel
 
     public function getWorkStatusTextAttr($value,$data)
     {
-         $status = [0=>'待派单',1=>'待领单',2=>'待联系',3=>'待上门',4=>'已上门',5=>'服务中',6=>'待结算',7=>'待评价',8=>'已完结'];
+         $status = [0=>'待派单',1=>'待领单',2=>'待联系',3=>'待上门',4=>'已上门',5=>'服务中',6=>'待结算',7=>'已完结',8=>'已评价'];
         return $status[$data['work_status']];
     }