在线工程师去掉服务区域限制

app/adminapi/lists/master_worker/MasterWorkerOnlineLists.php

@@ -82,7 +82,7 @@ class MasterWorkerOnlineLists extends BaseAdminDataLists implements ListsSearchI
      */
     public function lists(): array
     {
-        $fields = ['mw.id,mw.avatar,mw.real_name,mw.mobile,mw.work_total,mw.distance,mw.accept_order_status,mw.address,mw.service_area_id,mw.type,mw.remark,mw.skill,mws.comprehensive_score, mws.weight_score,sa.service_name,mwr.credential_images'];
+        $fields = ['mw.id,mw.avatar,mw.real_name,mw.mobile,mw.work_total,mw.distance,mw.accept_order_status,mw.address,mw.type,mw.remark,mw.skill,mws.comprehensive_score, mws.weight_score,sa.service_name,mwr.credential_images'];
         $orders = ['mw.id' => 'desc'];
         $queryWhere = $this->queryWhere();
         // 根据位置排序
@@ -97,7 +97,6 @@ class MasterWorkerOnlineLists extends BaseAdminDataLists implements ListsSearchI
         
         $list = MasterWorker::alias('mw')
             ->join('master_worker_score mws', 'mws.worker_id = mw.id')
-            ->join('service_area sa', 'sa.id = mw.service_area_id')
             ->join('master_worker_register mwr', 'mwr.worker_id = mw.id')
             ->where(['mw.is_disable' => 0, 'mw.work_status' => 0,'mw.audit_state' => 1])
             ->where($this->searchWhere)

app/adminapi/logic/master_worker/MasterWorkerLogic.php

@@ -401,6 +401,7 @@ class MasterWorkerLogic extends BaseLogic
             if($order->order_status === 1 && empty($order->openid) && $params['amount']>0){ // 可以改价
                 $order->order_amount= $params['amount']??0;
                 $order->save();
+                $is_share = $order->order_amount > 0 ? true : false;
             }else{ // 已结束 - 不用分享二维码
                 if((float)$order->order_amount>0 && empty($params['amount'])) $is_share = true;
                 else $is_share = false;

app/common/logic/PayNotifyLogic.php

@@ -230,8 +230,9 @@ class PayNotifyLogic extends BaseLogic
             MasterWorkerRetentionMoneyLog::create([
                 'sn' => generate_sn(MasterWorkerRetentionMoneyLog::class,'sn'),
                 'worker_id' => $order->worker_id,
-                'action' => 3,
+                'action' => 1,
                 'amount' => $order->paid_amount,
+                'remark' => '质保金缴费',
                 'source' => 3,
             ]);
         }