edit

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

@@ -268,4 +268,9 @@ class OrderListController extends Controller
         $return_data = OrderListService::LicenseFeedback($request->all());
         return response()->json($return_data);
     }
+    //获取施工门店信息
+    public function getService ( Request $request ){
+        $return_data = OrderListService::getService($request->all());
+        return response()->json($return_data);
+    }
 }

app/Http/Controllers/Common/CommonController.php

@@ -393,7 +393,7 @@ class CommonController extends BaseController
 			break;
 			case 2:
 			    if($parameter['company_name_like']!='统一价格') {
-                    $parameter['admin_groupnew'] = 2;
+                    $parameter['admin_groupnew_searchin'] = [2,3];
                     $list = AdminsService::getAdmins($parameter, ['id', 'company_name'], []);
                     if($Pri_id !=86) {
                         $lists[0]['id'] = '0';

app/Http/Controllers/Orders/OrderListController.php

@@ -133,6 +133,8 @@ class OrderListController extends BaseController
         $where = "is_delete = 1";
         if($session_token['admin_groupnew'] == 2){
            $where .= " and ser_id='".$session_token['id']."'";
+        }elseif($session_token['com_type'] == 2){
+            $where .= " and agency_id='".$session_token['company_id']."'";
         }else{
             if(!in_array($session_token['admin_groupnew'],[7,8])) {
                 $where .= " and p_id in (".$session_token['admin_pt_id'].")";
@@ -143,6 +145,8 @@ class OrderListController extends BaseController
         $session_token = $request->get('session_token');
         if ($session_token['admin_groupnew'] == 2){
             $ansql = " ser_id in (".$session_token['id'].")";
+        }elseif($session_token['com_type'] == 2){
+            $where .= " and agency_id='".$session_token['company_id']."'";
         }else{
             if(!in_array($session_token['admin_groupnew'],[7,8])) {
                 $ansql = " p_id in (".$session_token['admin_pt_id'].")";

app/Http/Controllers/Service/PayController.php

@@ -27,7 +27,7 @@ class PayController extends BaseController
         $this->bootWithService($service);
     }
 
-    // 商户号 1619735999 
+    // 商户号 1619735999
     protected $mchid = '1643850123';
     protected $appid = 'wx5a9e016f8ebb40c7';
     // protected $apiKey = 'a92d64dd5fcf2d72cd12df9aeb9c7a5a';
@@ -90,7 +90,7 @@ class PayController extends BaseController
         if($list){
             foreach ($list as $k =>$v){
                 $button = [];
-                if ($v['reo_pay_state'] == 1 && $v['reo_type'] == 1){
+                if ($v['reo_pay_state'] == 1 && $v['reo_type'] == 1 && $v['']){
                     $button[] = 'payment';
                 }
                 $button = BmmcService::getListButton($button,$all_button);
@@ -130,7 +130,7 @@ class PayController extends BaseController
                     $list[$k]['reo_client_type_name'] = "其他";
                 }
 
-                
+
                 if ($v['reo_pay_time'] == '0000-00-00 00:00:00') {
                     $list[$k]['reo_pay_time'] = "--";
                 }
@@ -228,7 +228,7 @@ class PayController extends BaseController
         $find_data = DB::table('admin_recharge')
             ->where('adre_company_id', $session['company_id'])
             ->first();
-        
+
         if (empty($find_data)) {
             $add_data['adre_company_id'] = $session['company_id'];
             $add_data['adre_adm_id'] = $session['id'];
@@ -303,7 +303,7 @@ class PayController extends BaseController
         $notify_res = WashPayservice::notify($get_input, $config);
         echo $notify_res;
     }
-    
+
     public function aliPay(Request $request) {
         // 获取用户信息
         $config = array (
@@ -396,7 +396,7 @@ class PayController extends BaseController
             $find_order = DB::table('recharge_order')
                 ->where('reo_order_number', $request['out_trade_no'])
                 ->first();
-            
+
             if ($find_order['reo_pay_state'] == 1) {
                 echo "success"; //请不要修改或删除
                 die;
@@ -416,7 +416,7 @@ class PayController extends BaseController
                     ->where('adre_id', $find_data['adre_id'])
                     ->update(['adre_banlance'=>$adre_banlance]);
             }
-            
+
             $find_data['find_order'] = $find_order;
             $find_data['update_order'] = $update_order;
             CommonService::addLog('支付回调:', json_encode($find_data,true), 1, 'aliPayNotify');

app/Http/Controllers/Service/ServiceProviderController.php

@@ -414,7 +414,13 @@ class ServiceProviderController extends BaseController
     {
         $session = Request()->get('session_token');//用户信息
         $brandList = PjBrandsService::getAll(); //品牌
-        $brandList = CommonService::arrayFilterFieldValue($brandList,[['company_id'=>$session['company_id']]]);
+        if($session['com_type'] ==2){
+            $agent_brand = trim($session['agent_brand'],',');
+            $agent_brand = explode(',', $agent_brand);
+            $brandList = CommonService::arrayFilterFieldValue($brandList,[['id'=>$agent_brand]]);
+        }else{
+            $brandList = CommonService::arrayFilterFieldValue($brandList,[['company_id'=>$session['company_id']]]);
+        }
         $serviceTypes = CategoryService::getAll(); //服务类型
 //        $serviceItems = ServiceItemsService::getAll(); //服务项目
         $serviceItems = PjBrandsService::dataList(); //门店属性

app/Http/Controllers/Service/WarehouseController.php

@@ -39,6 +39,7 @@ class WarehouseController extends BaseController
         $session = Request()->get('session_token');//用户信息
         $Db = new Warehouse();
         $Db = $Db->leftjoin('company', 'com_id', '=', 'company_id');
+        $Db = $Db->where('com_type', 2);
         if($request->filled('shck_ckmc')){ //仓库名称
             $shck_ckmc = $request->input('shck_ckmc');
             $Db = $Db->where('shck_ckmc', 'like','%'.$shck_ckmc.'%');
@@ -231,9 +232,12 @@ class WarehouseController extends BaseController
             ->leftjoin('pj_goods as p', 'p.pg_id', '=', 'g.goio_goo_id')
             ->leftjoin('warehouse as w', 'g.goio_ware_id', '=', 'w.id')
             ->leftjoin('company as c','c.com_id', '=', 'w.company_id')
-            ->where(function ($query) use ($request) {
+            ->where(function ($query) use ($request,$session) {
+                if ($session['com_type'] == 2) {
+                    $query->where('w.company_id', $session['company_id']);
+                }
                 if (!empty($request['company_id'])) {
-                    $query->where('company_id', $request['company_id']);
+                    $query->where('w.company_id', $request['company_id']);
                 }
             })
             ->where(function ($query) use ($request) {

app/Services/AftersaleOrderService.php

@@ -890,6 +890,7 @@ class AftersaleOrderService extends Service
                     }
                     $post['after_type'] = $after_type;
                     $post['company_id'] = $session['company_id'];
+                    $post['agency_id']=$orderInfo['agency_id']??'0';
                     $rea = OrderAfter::insertGetId($post);
                     /*---------------------------------------添加售后数据结束------------------------------------------*/
                     if($rea){

app/Services/Api/MobileWeb/AftersaleOrderService.php

@@ -47,8 +47,8 @@ class AftersaleOrderService extends Model
         $list_data = DB::table('order_after as o');
         if($session['user_type']==3){
             $where['agency_id'] =$session['company_id'];//服务商id
-            if(!isset($request['search_all']) || $request['search_all']==1){//仅展示本门店
-                $where['ser_id'] = $session['admin_id'];//服务商id
+            if(isset($request['search_company_id']) && !empty($request['search_company_id'])){//仅展示本门店
+                $where['ser_id'] = $request['search_company_id'];//服务商id
             }
         }else {
             $where['ser_id'] = $session['admin_id'];//服务商id
@@ -73,7 +73,8 @@ class AftersaleOrderService extends Model
         }
         $wheres = array_merge($where, $wheres);
         $wheres = CommonService::jointWhere($wheres);
-        $list_data = $list_data->whereRaw($wheres)
+        $list_data = $list_data
+            ->whereRaw($wheres)
             ->select('id', 'after_num', 'shr_id', 'shr_name', 'shr_phone', 'shr_address', 'shr_sheng', 'shr_shi','shr_xian', 'good_names', 'create_time', 'deal_sertime', 'finish_time', 'status', 'day_time');
 
         $list_data = $list_data->orderby('id', 'desc');

app/Services/Api/MobileWeb/OrderListService.php

@@ -40,8 +40,8 @@ class OrderListService extends Model
             ->leftJoin('user as u', 'ol.customer_id', '=', 'u.id');
         if($session['user_type']==3){
             $where['agency_id'] =$session['company_id'];//服务商id
-            if(!isset($request['search_all']) || $request['search_all']==1){//仅展示本门店
-                $where['ser_id'] = $session['admin_id'];//服务商id
+            if(isset($request['search_company_id']) && !empty($request['search_company_id'])){//仅展示本门店
+                $where['ser_id'] = $request['search_company_id'];//服务商id
             }
         }else {
             $where['ser_id'] = $session['admin_id'];//服务商id
@@ -1327,7 +1327,28 @@ class OrderListService extends Model
         }
         return ['ErrorCode' => 1, 'ErrorMessage' => '获取信息成功', 'Data' => $order_list];
     }
-
+    /**|---------------------------------------------------------------------------------
+     * @name 获取服务商
+     * @retrun \Illuminate\Http\JsonResponse /multitype:array
+     * @author dou 2024/9/18 15:55
+     * |---------------------------------------------------------------------------------
+    */
+    public static function getService ( $request ){
+        $session = $request['session'];
+        if($session['user_type']==3){
+            $list = Admin::whereIn('admin_groupnew',[2,3])
+                ->where("company_id",$session['company_id']);
+            if(isset($request['company_name']) && !empty($request['company_name'])){
+                $list = $list->where("company_name",'like','%'.$request['company_name'].'%');
+            }
+            $list = $list->orderBy('admin_groupnew','DESC')
+                ->select('id','company_name')
+                ->get();
+        }else{
+            $list = [];
+        }
+        return ['ErrorCode' => 1, 'ErrorMessage' => '操作成功', 'Data' => $list];
+    }
     // 获取技师
     public static function getInstallPerson($request)
     {

app/Services/Api/MobileWeb/StatementsListService.php

@@ -49,6 +49,9 @@ class StatementsListService extends Model
                 ->leftJoin('order_msg as om', 'om.id', '=', 'o.order_goods_id');
                 if($session['user_type']==3){
                     $list_data = $list_data->where('s.agency_id', $session['company_id']);
+                    if(isset($request['search_company_id']) && !empty($request['search_company_id'])){//仅展示本门店
+                        $list_data = $list_data->where('s.ser_id', $request['search_company_id']);
+                    }
                     if(!isset($request['search_all']) || $request['search_all']==1){//仅展示本门店
                         $list_data = $list_data->where('s.ser_id', $session['admin_id']);
                     }

app/Services/OrderListService.php

@@ -570,9 +570,6 @@ class OrderListService extends Service
        if (!in_array($session['admin_groupnew'], [2,3,7])){//管理员可以看全部
            $where['gone_order_list.company_id'] = $session['company_id'];
        }
-       if ($session['com_type'] == 2) {
-           $where['gone_order_list.agency_id'] = $session['company_id'];
-       }
 
    	$where = CommonService::jointWhere($where);
    	$page_size = $input['page_size']??10;
@@ -637,8 +634,13 @@ class OrderListService extends Service
    public static function getCommonWhere ( $session ){
        $where = [];
        $where['gone_order_list.is_delete'] = 1;
-       if ($session['admin_groupnew'] == 2){
-           $where['gone_order_list.ser_id_searchin'] =  $session['id'];
+       if ($session['admin_groupnew'] == 2 || $session['com_type'] ==2){
+
+           if ($session['com_type'] == 2) {
+               $where['gone_order_list.agency_id'] = $session['company_id'];
+           }else {
+               $where['gone_order_list.ser_id_searchin'] = $session['id'];
+           }
        }else{
            if(!in_array($session['admin_groupnew'],[7,8])) {
                $where['p_id_searchin'] = $session['admin_pt_id'];

app/Services/OrderService.php

@@ -1087,7 +1087,7 @@ class OrderService extends Service
                         $shr_phone = CommonService::getUser('id', $input['user_id']);
                         $post['ser_id'] = $input['ser_id'];//服务中心id
                         $post['order_status'] = 20;//已派单
-                        
+
                     }
                     $install=InstallPerson::whereRaw("(admin_id='".$input['ser_id']."' or company_id='".$input['ser_id']."') and delet_y=1 and install_state=1 and install_is_type=1 and is_shman=2 and bind_id is not null")->select('id','check_code','install_name','install_phone','bind_id')->first();
                     $push_type=1;

routes/api.php

@@ -1439,6 +1439,7 @@ Route::namespace('Api')->group(function () {
         Route::post('w1/OrderList/getLabel', 'MobileWeb\OrderListController@getLabel'); //获取标签
         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/imageFeedback', 'MobileWeb\OrderListController@imageFeedback'); //施工反馈，图片反馈
         Route::post('w1/OrderList/LicenseFeedback', 'MobileWeb\OrderListController@LicenseFeedback'); //施工反馈，车牌反馈