修改客方

application/index/service/BrokerService.php

@@ -47,10 +47,21 @@ class BrokerService
      */
     public function saveAgentData(array $data, int $operation_id)
     {
+        $result['status'] = 'fail';
         $is_new_id = 1;
-        $validate = new AAgentValidate();
         $m_district = new ADistrict();
-        $data['site_id'] = $m_district->getDistrictKeyById('site_id', ['id' => $data['district_id']]);
+        $new_site_id = $data['site_id'] = $m_district->getDistrictKeyById('site_id', ['id' => $data['district_id']]);
+        $validate = new AAgentValidate();
+        if (empty($data['id'])) {
+            $check = $validate->scene('add')->check($data);
+        } else {
+            $check = $validate->scene('edit')->check($data);
+        }
+
+        if (!$check) {
+            $result['msg'] = $validate->getError();
+            return $result;
+        }
 
         $select_where['name'] = $data['name'];
         $select_where['site_id'] = $data['site_id'];
@@ -63,30 +74,18 @@ class BrokerService
         }
         $check_id = $this->m_agent->getAgentsByWhere($select_where, 'id');
 
-        $result['status'] = 'fail';
         if ($check_id) {
             $result['msg'] = '同一城市出现同名，请修改。';
             return $result;
         }
 
-        if (empty($data['id'])) {
-            $check = $validate->scene('add')->check($data);
-        } else {
-            $check = $validate->scene('edit')->check($data);
-        }
-
-        if (!$check) {
-            $result['msg'] = $validate->getError();
-            return $result;
-        }
-
         try {
             $field = 'id,name,phone,sex,img,status,inviter_id,admin_off,quit_time,password,site_id,district_id,store_id,auth_group_id,level';
             if (empty($data['id'])) {
                 $agent_old = $this->m_agent->getAgentById($field, ['phone' => $data['phone']]);
                 $where['phone'] = $data['phone'];
                 $where['site_id'] = $data['site_id'];
-                $agent_data = $this->m_agent->verifyUser($field, '', $where);
+                $agent_data = $this->m_agent->findByOne($field, $where);
 
                 if (!empty($agent_data) && $agent_data['status'] == 0) {
                     $result['msg'] = '该用户已存在';
@@ -132,10 +131,7 @@ class BrokerService
                 if (empty($data['password'])) {
                     $data['password'] = substr($data['phone'], -6);  //默认密码
                 }
-
-                $new_site_id = $m_district->getDistrictKeyById('site_id', ['id' => $data['district_id']]);
             } else {
-                $agent_old = $this->m_agent->getAgentById($field, ['phone' => $data['phone'], 'status' => 0]);
                 $agent_data = $this->m_agent->getAgentInfo($field, $data['id']);
 
                 if (empty($agent_data)) {
@@ -144,7 +140,6 @@ class BrokerService
                 }
 
                 $old_site_id = $m_district->getDistrictKeyById('site_id', ['id' => $agent_data['district_id']]);
-                $new_site_id = $m_district->getDistrictKeyById('site_id', ['id' => $data['district_id']]);
                 if ($old_site_id != $new_site_id && $data['confirm_old'] != 1) {
                     $result['msg'] = '编辑部门，导致所属城市不一致';
                     return $result;
@@ -214,11 +209,11 @@ class BrokerService
                 }
             } elseif ($data['confirm_old'] == 1){
                 $data['site_id'] = $new_site_id;
-                $id = $this->transferAgent($data, $agent_old, $is_new_id, $operation_id); //转勤
+                $id = $this->transferAgent($data, $agent_data, $is_new_id, $operation_id); //转勤
 
                 if ($id > 0) {
-                    if ($agent_old[0]['id'] > 0) {
-                        $redis_service->agentCache($agent_old['id']);
+                    if ($agent_data['id'] > 0) {
+                        $redis_service->agentCache($agent_data['id']);
                     }
                     $redis_service->agentCache($id);
                     $result['msg'] = '转勤成功';
@@ -351,28 +346,28 @@ class BrokerService
 
             if (empty($transfer_agent)) {
                 if ($is_new_id) {
-                    $this->m_agent->saveAgent(['id'=>$agent_old[0]['id'], 'status'=>3]);  //将原来的设置为转勤状态
+                    $this->m_agent->saveAgent(['id'=>$agent_old['id'], 'status'=>3]);  //将原来的设置为转勤状态
 
                     unset($data['id']);
-                    $data['password_md5'] = $agent_old[0]['password'];
-                    $data['img'] = $agent_old[0]['img'];
+                    $data['password_md5'] = $agent_old['password'];
+                    $data['img'] = $agent_old['img'];
                     $id = $this->m_agent->saveAgent($data); //普通转勤
-                    $this->transferUserHouse($id, $agent_old[0]['id'], $operation_id, $data);
-                    $this->transferEvaluate($id, $agent_old[0]['id']);
+                    $this->transferUserHouse($id, $agent_old['id'], $operation_id, $data);
+                    $this->transferEvaluate($id, $agent_old['id']);
                 } else {
-                    $agent_old[0]['status'] = 3;
-                    unset($agent_old[0]['id']);
-                    $this->m_agent->saveAgent($agent_old[0]);  //新增一条转勤状态
-
-                    $data['id'] = $agent_old[0]['id'];     //将原来的id作为新的
-                    $data['img'] = $agent_old[0]['img'];
+                    $data['id'] = $agent_old['id'];     //将原来的id作为新的
+                    $data['img'] = $agent_old['img'];
                     $id = $this->m_agent->saveAgent($data);
+
+                    $agent_old['status'] = 3;
+                    unset($agent_old['id']);
+                    $this->m_agent->saveAgent($agent_old);  //新增一条转勤状态
                 }
             } else {
-                $this->m_agent->saveAgent(['id'=>$agent_old[0]['id'], 'status'=>3]);  //将原来的设置为转勤状态
-                $this->m_agent->saveAgent(['id'=>$transfer_agent, 'status'=>0, 'img'=>$agent_old[0]['img']]);  //将原来转勤状态处理为正常
-                $this->transferUserHouse($transfer_agent, $agent_old[0]['id'], $operation_id, $data);
-                $this->transferEvaluate($transfer_agent, $agent_old[0]['id']);
+                $this->m_agent->saveAgent(['id'=>$agent_old['id'], 'status'=>3]);  //将原来的设置为转勤状态
+                $this->m_agent->saveAgent(['id'=>$transfer_agent, 'status'=>0, 'img'=>$agent_old['img']]);  //将原来转勤状态处理为正常
+                $this->transferUserHouse($transfer_agent, $agent_old['id'], $operation_id, $data);
+                $this->transferEvaluate($transfer_agent, $agent_old['id']);
                 $id = $transfer_agent;
             }