up - 工程师登录所需注册信息

app/adminapi/logic/master_worker_register/MasterWorkerRegisterLogic.php

@@ -154,6 +154,28 @@ class MasterWorkerRegisterLogic extends BaseLogic
                 'area_name' => $params['area_name'],
                 'tenant_id' => $params['tenant_id']??0,
             ]);
+
+            MasterWorkerRegister::create([
+                'maintain_exp_type' => isset($params['maintain_exp_type'])?$params['maintain_exp_type']:0,
+                'other_exp_type' => isset($params['other_exp_type'])?$params['other_exp_type']:'',
+                'other_exp_name' => (isset($params['other_exp_name']) && isset($params['other_exp_type']) && $params['other_exp_type'] == 4)?$params['other_exp_name']:'',
+                'province' => $params['province']??0,
+                'city' => $params['city']??0,
+                'area_name' => $params['area_name']??'',
+                'vehicle_type' => $params['vehicle_type']??0,
+                'name' => $params['real_name'],
+                'age' => $params['age']??0,
+                'sex' => $params['sex']??0,
+                'status' => 1,
+                'worker_id' => $masterWorker->id,
+                'mobile' => $params['mobile'],
+                'is_credential' => !empty($params['is_credential'])?$params['is_credential']:0,
+                'credential_name' => !empty($params['credential_name'])?$params['credential_name']:'',
+                'credential_images'=>!empty($params['credential_images'])?json_encode($params['credential_images'],JSON_UNESCAPED_UNICODE):'',
+                'lon' => !empty($params['lon'])?$params['lon']:0,
+                'lat' => !empty($params['lat'])?$params['lat']:0,
+                'address' => !empty($params['address'])?$params['address']:'',
+            ]);
         }
         return $masterWorker->id;
     }

app/tenantapi/lists/master_worker/MasterWorkerLists.php

@@ -128,13 +128,13 @@ class MasterWorkerLists extends BaseAdminDataLists implements ListsSearchInterfa
             $where[] =[ 'mw.work_total','<= ',$this->params['max_work_number']];
         }
         if(isset($this->params['order_id']) && $this->params['order_id']){
-            $lon_lat = (ServiceWork::where('id',$this->params['order_id'])->column("lon,lat,goods_category_id"))[0];
-            $this->lon = $lon_lat['lon'];
-            $this->lat = $lon_lat['lat'];
-            $goods_category_id = $lon_lat['goods_category_id'];
+//            $lon_lat = (ServiceWork::where('id',$this->params['order_id'])->column("lon,lat,goods_category_id"))[0];
+//            $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];
+            //$ids = DistributeLeafletsService::getIntersection($goods_category_id??0);
+            //$where[] = [ 'mw.id','IN',$ids];
             $where[] = [ 'mw.work_status','=',0];
         }
         Log::debug('MasterWorker-where:'.json_encode($where));

app/tenantapi/logic/master_worker/MasterWorkerLogic.php

@@ -18,6 +18,7 @@ namespace app\tenantapi\logic\master_worker;
 use app\common\model\master_worker\MasterWorker;
 use app\common\logic\BaseLogic;
 use app\common\model\master_worker\MasterWorkerRetentionMoneyLog;
+use app\common\model\master_worker_register\MasterWorkerRegister;
 use app\common\service\ConfigService;
 use think\db\Query;
 use think\facade\Config;
@@ -62,39 +63,7 @@ class MasterWorkerLogic extends BaseLogic
             //$password = create_password($params['mobile'], $passwordSalt);
             $avatar = ConfigService::get('default_image', 'user_avatar');
 
-            MasterWorker::create([
-                /*'sn' => $params['sn'],
-                'avatar' => $params['avatar'],
-                'real_avatar' => $params['real_avatar'],
-                'real_name' => $params['real_name'],
-                'nickname' => $params['nickname'],
-                'account' => $params['account'],
-                'password' => $params['password'],
-                'mobile' => $params['mobile'],
-                'sex' => $params['sex'],
-                'channel' => $params['channel'],
-                'is_disable' => $params['is_disable'],
-                'login_ip' => $params['login_ip'],
-                'login_time' => $params['login_time'],
-                'is_new_user' => $params['is_new_user'],
-                'estimate_money' => $params['estimate_money'],
-                'user_money' => $params['user_money'],
-                'earnest_money' => $params['earnest_money'],
-                'exp' => $params['exp'],
-                'lon' => $params['lon'],
-                'lat' => $params['lat'],
-                'distance' => $params['distance'],
-                'province' => $params['province'],
-                'city' => $params['city'],
-                'area_name' => $params['area_name'],
-                'cooperation' => $params['cooperation']??0,
-                'time_period' => $params['time_period']??'',
-                'work_status' => $params['work_status']??0,
-                'recruiting_behalf' => $params['recruiting_behalf']??'',
-                'settlement_type' => $params['settlement_type']??2,
-                'labels' => (isset($params['labels']) && $params['labels'])?implode(',',$params['labels']):'',
-                'remark' => $params['remark']??'',*/
-
+            $masterWorker = MasterWorker::create([
                 'sn' => $userSn,
                 'worker_number' => $number,
                 'avatar' => $avatar,
@@ -137,6 +106,28 @@ class MasterWorkerLogic extends BaseLogic
                 'audit_state' => 1,
             ]);
 
+            MasterWorkerRegister::create([
+                'maintain_exp_type' => isset($params['maintain_exp_type'])?$params['maintain_exp_type']:0,
+                'other_exp_type' => isset($params['other_exp_type'])?$params['other_exp_type']:'',
+                'other_exp_name' => (isset($params['other_exp_name']) && isset($params['other_exp_type']) && $params['other_exp_type'] == 4)?$params['other_exp_name']:'',
+                'province' => $params['province']??0,
+                'city' => $params['city']??0,
+                'area_name' => $params['area_name']??'',
+                'vehicle_type' => $params['vehicle_type']??0,
+                'name' => $params['real_name'],
+                'age' => $params['age']??0,
+                'sex' => $params['sex']??0,
+                'status' => 1,
+                'worker_id' => $masterWorker->id,
+                'mobile' => $params['mobile'],
+                'is_credential' => !empty($params['is_credential'])?$params['is_credential']:0,
+                'credential_name' => !empty($params['credential_name'])?$params['credential_name']:'',
+                'credential_images'=>!empty($params['credential_images'])?json_encode($params['credential_images'],JSON_UNESCAPED_UNICODE):'',
+                'lon' => !empty($params['lon'])?$params['lon']:0,
+                'lat' => !empty($params['lat'])?$params['lat']:0,
+                'address' => !empty($params['address'])?$params['address']:'',
+            ]);
+
             Db::commit();
             return true;
         } catch (\Exception $e) {