edit

app/Http/Controllers/Api/MobileWeb/OrderListController.php

@@ -273,4 +273,15 @@ class OrderListController extends Controller
         $return_data = OrderListService::getService($request->all());
         return response()->json($return_data);
     }
+    //指派门店
+    public function sendAgain ( Request $request ){
+        // 验证数据
+        $error_message = $this->dataValidator->sendAgainValidator($request->all());
+        if ($error_message) {
+            return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
+        }
+
+        $return_data = OrderListService::sendAgain($request->all(),$request->ip());
+        return response()->json($return_data);
+    }
 }

app/Http/Controllers/Api/SynOrderRejectedController.php

@@ -24,7 +24,7 @@ class SynOrderRejectedController extends BaseController
     public function rejectedOrder ( ){
         if('08:30:00'<date("H:i:s") && '18:00:00'>date("H:i:s")){
             $time_start = date("Y-m-d H:i:s", strtotime(" -15 minute" . date("Y-m-d H:i:s")));
-            $list = OrderList::where('stauas', '20')->where('ol_distype', '>', 1)->whereIn('company_id', [12, 14])->where('create_time', '<', $time_start)->select('id', 'order_num', 'sys_num', 'serial_number')->limit(10)->get();
+            $list = OrderList::where('stauas', '20')->where('ol_distype', '>', 1)->where('ol_distype', 2)->whereIn('company_id', [12, 14])->where('create_time', '<', $time_start)->select('id', 'order_num', 'sys_num', 'serial_number')->limit(10)->get();
             $list = CommonService::dataToArray($list);
             $id = [];
             $num = 0;

app/Http/Controllers/Orders/OrderListController.php

@@ -3038,7 +3038,21 @@ class OrderListController extends BaseController
         }
 
     }
-
+    /**|---------------------------------------------------------------------------------
+     * @name 指派门店
+     * @param string id 服务工单id
+     * @param string ser_id 改派的服务门店
+     * @retrun \Illuminate\Http\JsonResponse /multitype:array
+     * @author dou 2024/9/19 15:15
+     * |---------------------------------------------------------------------------------
+     */
+    public function sendAgain ( Request $request ){
+        if (!$request->filled('id')||!$request->filled('ser_id')) {
+            return $this->error('参数错误无工单ID或服务商id', ErrorInc::FAILED_PARAM, []);exit;
+        }
+        $return = OrderListService::sendAgain($request->all(),$request->ip(),$request->get('session_token'));
+        return $this->error($return['ErrorMessage'], $return['ErrorCode'], $return['Data']);
+    }
     private function getSign($params,$sec) {
         if ($params != null) { // 所有请求参数按照字母先后顺序排序
             ksort($params);

app/Http/Controllers/User/LoginController.php

@@ -237,9 +237,9 @@ class LoginController extends BaseController
         $result['com_parent_id'] = $com_parent_id.",".$result['company_id'];
          $result['com_type'] = $company['com_type'];
          if($company['com_type']==2){
-             $company['search_id'] = Admin::where('company_id',$result['company_id'])->where("admin_groupnew",3)->value('id');
+             $result['search_id'] = Admin::where('company_id',$result['company_id'])->where("admin_groupnew",3)->value('id');
          }else{
-             $company['search_id']=$result['id'];
+             $result['search_id']=$result['id'];
          }
      	$function = Functions::where('function_type',3)->select('function_id','function_model','function_action')->get()->toArray();
         $list = [];

app/Http/Requests/Validators/Api/MobileWeb/OrderListValidator.php

@@ -375,6 +375,28 @@ class OrderListValidator extends FormRequest
             'id' => 'required|integer|min:1',
         ], $messages);
 
+        // 判断数据验证是否成功
+        if ($validator->fails()) {
+            return $validator->errors();
+        }
+    }
+    // 指派门店
+    public function sendAgainValidator($data)
+    {
+        // 自定义错误消息
+        $messages = [
+            'ser_id.required' => '请输入服务门店id',
+            'ser_id.integer' => '参数错误',
+            'id.required' => '请输入服务工单id',
+            'id.integer' => '参数错误',
+        ];
+
+        // 数据验证
+        $validator = Validator::make($data, [
+            'ser_id' => 'required|integer|min:1',
+            'id' => 'required|integer|min:1',
+        ], $messages);
+
         // 判断数据验证是否成功
         if ($validator->fails()) {
             return $validator->errors();

app/Services/OrderListService.php

@@ -3,6 +3,7 @@ namespace App\Services;
 use App\Http\Controllers\BaseController;
 use App\Models\Feedback;
 use App\Models\InstallPerson;
+use App\Models\Orders;
 use App\Models\SerInfor;
 use DB;
 use App\Models\OrderList;
@@ -579,7 +580,7 @@ class OrderListService extends Service
    	//`car_make` varchar(255) DEFAULT NULL COMMENT '品牌',
        //  `car_line` varchar(50) DEFAULT NULL COMMENT '车系',
        //  `car_model` varchar(255) DEFAULT NULL COMMENT '车型',
-   	$paginate = $Db->whereRaw($where)->select('order_list.*','user.car_make','user.car_line','user.car_model','user.shr_code','user.shr_name','user.shr_phone','user.shr_sheng','user.shr_shi','user.shr_xian','user.shr_adress','admin.company_name','admin.enable','admin.mouth_pay','admin.brand_service','admin.ad_project','admin.ad_alias');
+   	$paginate = $Db->whereRaw($where)->select('order_list.*','user.car_make','user.car_line','user.car_model','user.shr_code','user.shr_name','user.shr_phone','user.shr_sheng','user.shr_shi','user.shr_xian','user.shr_adress','admin.company_name','admin.enable','admin.mouth_pay','admin.brand_service','admin.ad_project','admin.ad_alias','ser_id');
         if (in_array($input['state'],[5,6,9,10])){
             $paginate = $paginate->orderBy('feeds_time','DESC');
         }if (in_array($input['state'],[3,4,7,8])){
@@ -635,11 +636,10 @@ class OrderListService extends Service
        $where = [];
        $where['gone_order_list.is_delete'] = 1;
        if ($session['admin_groupnew'] == 2 || $session['com_type'] ==2){
-
-           if ($session['com_type'] == 2) {
-               $where['gone_order_list.agency_id'] = $session['company_id'];
-           }else {
+            if($session['admin_groupnew'] == 2){
                 $where['gone_order_list.ser_id_searchin'] = $session['id'];
+            }else{
+                $where['gone_order_list.agency_id'] = $session['company_id'];
             }
        }else{
            if(!in_array($session['admin_groupnew'],[7,8])) {
@@ -674,10 +674,20 @@ class OrderListService extends Service
 
             }else {
                 if ($v['stauas'] == 10 || $v['stauas'] == 20) {
+
+                    if($session['admin_groupnew']==3 && $v['ser_id']==$session['search_id']){
+                        $button[] ='sendAgain';
+                    }
                     $button[] = 'getOrder,refuseOrder';//day_time<'".$time
                 } elseif (($v['stauas'] == 30) && (($v['day_time'] < $time) || $v['day_time'] == '')) {
+                    if($session['admin_groupnew']==3 && $v['ser_id']==$session['search_id']){
+                        $button[] ='sendAgain';
+                    }
                     $button[] = 'refuseOrder,feedbackrefer,appointment,transferOrder,negprice';
                 } elseif (($v['stauas'] == 30) && ($v['day_time'] > $time)) {
+                    if($session['admin_groupnew']==3 && $v['ser_id']==$session['search_id']){
+                        $button[] ='sendAgain';
+                    }
                     $button[] = 'refuseOrder,feedbackrefer,negprice';
                 } elseif ($v['stauas'] == 34) {
                     if($v['delay_status']==1){
@@ -697,7 +707,7 @@ class OrderListService extends Service
             }
             $button[] = 'addNote,sendSmsOrderListModel';
             if($session['admin_groupnew']==3 && $v['ser_id']!=$session['search_id']){
-                $button[] = [];
+                $button = [];
             }
             $button = BmmcService::getListButton($button,$all_button);
             $list[$k]['button_one'] = $button['button_one']??[];
@@ -819,7 +829,52 @@ class OrderListService extends Service
        }
        return $data;
    }
-
+/**|---------------------------------------------------------------------------------
+     * @name 指派门店
+     * @param string id 服务工单id
+     * @param string ser_id 改派的服务门店
+     * @retrun \Illuminate\Http\JsonResponse /multitype:array
+     * @author dou 2024/9/19 15:15
+     * |---------------------------------------------------------------------------------
+    */
+    public static function sendAgain ( $request, $ip, $session ){
+        $find_design_order = OrderList::where("id",$request['id'])
+            ->where('is_delete', 1)
+            ->first();
+        // 判断是否已派单
+        if (empty($find_design_order)) {
+            return ['ErrorCode' => ErrorInc::DATA_EMPTY, 'ErrorMessage' => '未查询到订单', 'Data' => []];
+        }
+        if ($find_design_order['stauas']!=30 && $find_design_order['stauas']!=20) {
+            return ['ErrorCode' => ErrorInc::REQUEST_FORBIDDEN, 'ErrorMessage' => '当前状态不指派门店', 'Data' => []];
+        }
+        if($find_design_order['ser_id']!=$session['search_id']){
+            return ['ErrorCode' => ErrorInc::REQUEST_FORBIDDEN, 'ErrorMessage' => '非直属订单不可改派', 'Data' => []];
+        }
+        DB::beginTransaction();
+        $resultOrder = Orders::where('order_num',$find_design_order['order_num'])->update(['ser_id'=>$request['ser_id'],'order_status'=>20,'intall_person'=>'','intall_phone'=>'']);
+        if($find_design_order['stauas']==30){
+            $settListArr = SettlementList::where("sys_num",$find_design_order['sys_num'])->where("sett_status",'>',1)->first();
+            if(!empty($settListArr)){
+                // 该单已审核
+                return ['ErrorCode' => ErrorInc::MYSQL_STEP_FAILED, 'ErrorMessage' => '存在结算工单不可指派', 'Data' => []];
+            }
+            $resultsettList = SettlementList::where("sys_num",$find_design_order['sys_num'])->delete();
+        }else{
+            $resultsettList = true;
+        }
+        $rest = OrderList::where('order_num',$find_design_order['order_num'])->update(['ser_id'=>$request['ser_id'],'stauas'=>20,'ol_distype'=>3,'intall_person'=>'','install_id'=>'','intall_phone'=>'','get_time'=>'']);
+        if($rest && $resultsettList && $resultOrder){
+            DB::commit();
+            $session['install_name'] = $session['admin_acc'];
+            CommonService::inserting_log('指派门店、',$find_design_order['sys_num'],'订单('.$find_design_order['order_num'].')','派工单列表',$session,$ip);//日志
+            \App\Services\Api\MobileWeb\OrderListService::operating_time($find_design_order['serial_number'],'指派门店',date("Y-m-d H:i:s"),$find_design_order['order_num'],$session);//订单操作时间
+            return ['ErrorCode' => 1, 'ErrorMessage' => '操作成功', 'Data' => []];
+        }else{
+            DB::rollback();//回滚
+            return ['ErrorCode' => ErrorInc::MYSQL_FAILED, 'ErrorMessage' => '操作失败', 'Data' => []];
+        }
+    }
    /**|---------------------------------------------------------------------------------
     * @name 获取销安装商品数量
     * @param array $type 区分类型 ser_id服务商id，p_id平台id，goods_id商品id，gs_bid品牌id

app/Services/OrderService.php

@@ -94,6 +94,7 @@ class OrderService extends Service
             'address' => '详细地址',
             'order_type' => '订单类型',
             'company_name' => '门店名称',
+            'company_id' => '所属公司id',
             'orders_id' => '订单数据id',
             'ser_id' => '门店id',
             'user_id' => '用户id',
@@ -1634,10 +1635,11 @@ class OrderService extends Service
                         $where['service_type_findinset'] = '1';
                     }
                 }
-             //  $where['brand_service_noteq'] = 6;
 
                 if ($session && $session['admin_groupnew'] != 7) {//管理员可以看全部
                     $where['company_id'] = $session['company_id']; //2022-11-3 获取服务商可不用分公司
+                    $where['company_type'] = 1;
+                    $where['admin_groupnew'] = 2;
                 }
 
                 $list = AdminsService::getAdmins($where,['id','company_name','is_lidao','owner','children_id','ad_brand','ad_project','brand_service'],['is_sord'=>'DESC']);
@@ -1764,7 +1766,8 @@ class OrderService extends Service
                 }else{
                     return ['Data' => '', 'ErrorMessage' => '无数据', 'ErrorCode' => ErrorInc::DATA_EMPTY];
                 }
-            }else if($input['is_type'] == 4){
+            }
+            else if($input['is_type'] == 4){
                 $checkKey = CommonService::checkKey(['company_name'],$input,OrderService::rulesShow());
                 if($checkKey['code']!=1){
                     return ['Data' => '', 'ErrorMessage' => '参数'.$checkKey['data'].'未填写,或值为空', 'ErrorCode' => ErrorInc::INVALID_PARAM];
@@ -1776,8 +1779,7 @@ class OrderService extends Service
                     $company_name_or['id_searchin'] = $verstorename_id;
                 }
                 $company_name_or['company_name_like'] = $input['company_name'];
-                $where = ['company_name_searchor'=>$company_name_or,'enable'=>1,'id_noteq'=>617,'ad_project_findinset'=>$category];
-                $where['brand_service_noteq'] = 6;
+                $where = ['company_name_searchor'=>$company_name_or,'enable'=>1,'ad_project_findinset'=>$category];
 
                 $pt_id_arr = PlatformService::getPtIdByPtType();
                 if(in_array($pt_id, $pt_id_arr))
@@ -1788,6 +1790,8 @@ class OrderService extends Service
 
                 if ($session && $session['admin_groupnew'] != 7) {//管理员可以看全部
                     $where['company_id'] = $session['company_id'];
+                    $where['company_type'] = 1;
+                    $where['admin_groupnew'] = 2;
                 }
                 CommonService::startmysql();
                 $list = AdminsService::getAdmins($where,['id','company_name','is_lidao','owner','children_id','ad_brand','ad_project','brand_service'],['is_sord'=>'DESC']);
@@ -1880,13 +1884,14 @@ class OrderService extends Service
                 }else{
                     return ['Data' => '', 'ErrorMessage' => '无数据', 'ErrorCode' => ErrorInc::DATA_EMPTY];
                 }
-            }else if($input['is_type'] == 3){
+            }
+            else if($input['is_type'] == 3){
                 $checkKey = CommonService::checkKey(['service_id'],$input,OrderService::rulesShow());
                 if($checkKey['code']!=1){
                     return ['Data' => '', 'ErrorMessage' => '参数'.$checkKey['data'].'未填写,或值为空', 'ErrorCode' => ErrorInc::INVALID_PARAM];
                 }
 
-                $list = AdminsService::getAdmins(['id'=>$input['service_id'],'company_id'=>$session['company_id']],['id','company_name','is_lidao','owner','children_id','ad_brand','ad_project','brand_service'],['is_sord'=>'DESC']);
+                $list = AdminsService::getAdmins(['id'=>$input['service_id'],'company_id'=>$session['company_id'],'company_type'=>1],['id','company_name','is_lidao','owner','children_id','ad_brand','ad_project','brand_service'],['is_sord'=>'DESC']);
                 if($list){
                     foreach( $list as $kri => $vri ){
                         $ad_brand = array_intersect(explode(',',trim($vri['ad_brand'],',')),$gs_bid);//统计匹配订单商品品牌量
@@ -1903,6 +1908,95 @@ class OrderService extends Service
                 }else{
                     return ['Data' => '', 'ErrorMessage' => '无数据', 'ErrorCode' => ErrorInc::DATA_EMPTY];
                 }
+            }
+            else if($input['is_type'] == 5){
+                $checkKey = CommonService::checkKey(['company_id'],$input,OrderService::rulesShow());
+                if($checkKey['code']!=1){
+                    return ['Data' => '', 'ErrorMessage' => '参数'.$checkKey['data'].'未填写,或值为空', 'ErrorCode' => ErrorInc::INVALID_PARAM];
+                }
+                $where = ['enable'=>1,'ad_project_findinset'=>$category];
+
+                if(isset($input['company_name']) && !empty($input['company_name'])) {
+                    $where['company_name_like'] = $input['company_name'];
+                }
+                if(isset($session['company_id'])){
+                    $where['company_id'] = $session['company_id'];
+                }else {
+                    $where['company_id'] = $input['company_id'];
+                }
+                $where['company_type'] = 2;
+                $pt_id_arr = PlatformService::getPtIdByPtType();
+                if(in_array($pt_id, $pt_id_arr))
+                    //if($pt_id == 453)
+                {
+                    $where['service_type_findinset'] = '3';
+                }
+                $list = AdminsService::getAdmins($where,['id','company_name','is_lidao','owner'],['is_sord'=>'DESC']);
+                if($list){
+                    $admin_id = array_column($list, 'id');
+                    $admin_infor = new AdminInfor();
+                    $children = CommonService::getMysqlData($admin_infor, ['admin_id_searchin'=>$admin_id] , ['admin_id','admin_longitude','admin_latitude','admin_province','admin_city','admin_county','admin_dressi','verstorename','verstoreid']);
+                    $admin_list = [];
+                    if($children){
+                        $admin_list = CommonService::jointArrayKey($children, 'admin_id');
+                    }
+                    $lists = [];
+                    $jingwei = [];
+                    $end = CommonService::jingwei($input['sheng'],$input['sheng'].$input['shi'].$input['xian'].$input['address']);
+                    foreach( $list as $kri => $vri ){
+                        $adminInfo = $admin_list[$vri['id']];
+                        $city = $adminInfo['admin_province'];
+                        if($adminInfo['admin_longitude'] && $adminInfo['admin_latitude'] && $vri['is_lidao']=='2'){
+                            $start = $adminInfo['admin_longitude'].','.$adminInfo['admin_latitude'];
+                        }else{
+                            $address = $adminInfo['admin_dressi'];
+                            $start = CommonService::jingwei($adminInfo['admin_province'],$address);
+                        }
+                        if($adminInfo['admin_dressi']=='' || $start ==''){
+                            $list[$kri]['juli'] = '';
+                            $list[$kri]['jl'] = 100000;
+                            $lists[] = $list[$kri];
+                            unset($list[$kri]);continue;
+                        }else{
+                            $jingwei[] = $start;
+                        }
+                    }
+                    if(!empty($jingwei) && !empty($end)){
+                        $jingwei = implode('|', $jingwei);
+                        $res = CommonService::juli($jingwei,$end,2);
+                    }else{
+                        $res = [];
+                    }
+                    $num_ = 0;
+                    foreach ($list as $k => $v) {
+                        if (!isset($res[$num_])) {
+                            $list[$k]['juli'] = '';
+                            $list[$k]['jl'] = 100000;
+                        } else {
+                            $list[$k]['juli'] = round($res[$num_]['distance']/1000,2) . '公里';
+                            $list[$k]['jl'] = round($res[$num_]['distance']/1000,2);
+                        }
+                        $num_++;
+                    }
+                    if(!empty($lists) && !empty($list)) {
+                        $list = array_merge($list, $lists);
+                    }elseif (!empty($lists)){
+                        $list = $lists;
+                    }
+                    $list = CommonService::resetListKey($list);
+                    $num = [];
+                    foreach($list as $k => $v){
+                        $total[]=$v['is_lidao'];
+                        $num[]=$v['jl'];
+                        if($v['jl'] == 100000000){
+                            unset($list[$k]['jl']);
+                        }
+                    }
+                    array_multisort($num, SORT_NUMERIC ,SORT_ASC, $list);
+                    return ['Data' => $list, 'ErrorMessage' => '操作成功', 'ErrorCode' => 1];
+                }else{
+                    return ['Data' => $list, 'ErrorMessage' => '无数据', 'ErrorCode' => 1];
+                }
             }else{
                 return ['Data' => '', 'ErrorMessage' => '参数错误-查询类型', 'ErrorCode' => ErrorInc::FAILED_PARAM];
             }

routes/api.php

@@ -491,6 +491,7 @@ Route::group(['prefix'=>'orderlist','middleware'=>'requestpc'], function(){
     Route::post('sendSmsOrderListModel', 'OrderListController@sendSmsOrderListModel');//发送短信
     Route::post('updateManhourfee', 'OrderListController@updateManhourfee');//修改工时费 2022-3-21
     Route::post('patchGetOrder', 'OrderListController@patchGetOrder');//批量接单 2022-3-23
+    Route::post('sendAgain', 'OrderListController@sendAgain');//指派门店 2024-09-19
 	});
 
 #订单系统 >> 备注导入
@@ -1440,6 +1441,7 @@ Route::namespace('Api')->group(function () {
         Route::post('w1/OrderList/operatingRecord', 'MobileWeb\OrderListController@operatingRecord'); //获取操作记录
         Route::post('w1/OrderList/getFeedback', 'MobileWeb\OrderListController@getFeedback'); //获取安装反馈数据
         Route::post('w1/OrderList/getService', 'MobileWeb\OrderListController@getService'); //获取系统推荐服务商
+        Route::post('w1/OrderList/sendAgain', 'MobileWeb\OrderListController@sendAgain'); //指派门店
 
         Route::post('w1/OrderList/imageFeedback', 'MobileWeb\OrderListController@imageFeedback'); //施工反馈，图片反馈
         Route::post('w1/OrderList/LicenseFeedback', 'MobileWeb\OrderListController@LicenseFeedback'); //施工反馈，车牌反馈