edit

app/Http/Controllers/Common/CommonController.php

@@ -280,6 +280,7 @@ class CommonController extends BaseController
             $brand_id = Company::where('com_id',$session['company_id'])->value('com_brand');
             $where['gs_bid_searchin'] = $brand_id;
         }
+        $where['company_id'] = $session['company_id'];
         if ($request->filled('function')) {
             if ($request->input('function') == 'supplierPrice') {
                 $gh_price = DB::table('gh_price')

app/Http/Controllers/Dou/MyTestController.php

@@ -17,6 +17,7 @@ use App\Http\Controllers\Api\SynJdRapidController;
 use App\Http\Controllers\BaseController;
 use App\Http\Controllers\Orders\AotuorderController;
 use App\Models\Admin;
+use App\Models\AdminInfor;
 use App\Models\JdBound;
 use App\Models\OrderList;
 use App\Models\OrderMsg;
@@ -57,7 +58,7 @@ class MyTestController extends BaseController
         if(empty($input['method'])){
             return $this->error('缺少必要参数1',ErrorInc::FAILED_PARAM);
         }
-        $api=['getSerStatistics','getSerStatisticsDetail','BasicExport','addOrderData','addOrderDatas','sysServiseCenter','getJdOrderStatus','getDataDecrypt','calculateOrderPrice','omnicOrderList','Distrib','tests'];
+        $api=['getSerStatistics','getSerStatisticsDetail','BasicExport','addOrderData','addOrderDatas','sysServiseCenter','getJdOrderStatus','getDataDecrypt','calculateOrderPrice','omnicOrderList','Distrib','tests','synAdminInfor'];
         if(!in_array($input['method'],$api)){
             return $this->error('接口不参数异常',ErrorInc::INVALID_PARAM,$input);
         }else {
@@ -1805,4 +1806,24 @@ class MyTestController extends BaseController
             echo CommonService::showmysql();
         }
     }
+
+    /**|---------------------------------------------------------------------------------
+     * @name 同步admininfor信息
+     * @retrun \Illuminate\Http\JsonResponse /multitype:array
+     * @author dou 2026/6/10 16:42
+     * |---------------------------------------------------------------------------------
+    */
+    public function synAdminInfor ( $input ){
+        $adnin = DB::table("admin")->where('id','>',$input['id'])->limit(50)->get();
+        $adnin = CommonService::dataToArray($adnin);
+        if($adnin){
+            foreach($adnin as $k => $v) {
+                $res = AdminInfor::where('admin_id',$v['id'])->update(['inf_company_name'=>$v['company_name'],'inf_mouth_pay'=>$v['mouth_pay'],'inf_enable'=>$v['enable'],'inf_ad_brand'=>$v['ad_brand'],'inf_agent_brand'=>$v['agent_brand'],'inf_company_id'=>$v['company_id'],'inf_invoice'=>$v['invoice'],'inf_deduct'=>$v['deduct'],'inf_type'=>$v['type']]);
+                dump($res);
+            }
+            dump($v);
+        }else{
+            dump('无更多数据');
+        }
+    }
 }

app/Http/Controllers/Service/ServiceProviderController.php

@@ -543,7 +543,7 @@ class ServiceProviderController extends BaseController
         $adminData = $request->only(['enable', 'company_name', 'is_lidao', 'admin_name', 'admin_acc', 'type','brand_service','service_type', 'admin_groupnew']);
         $admin_acc = Admin::where("admin_acc",$adminData['admin_acc'])->where("company_id",$session['company_id'])->first();
         if($admin_acc){
-            return $this->error('账户名已存在', ErrorInc::INVALID_PARAM);
+            return $this->error('登录名已存在', ErrorInc::INVALID_PARAM);
         }
         if(is_array($adminData['service_type'])){
             $adminData['service_type'] = implode(',', $adminData['service_type']);
@@ -553,7 +553,7 @@ class ServiceProviderController extends BaseController
         $adminData = $this->_setAdminData($adminData, $request);
         $adminData['company_id'] = $session['company_id'];
         $adminData['company_type'] = $session['com_type'];
-
+        DB::beginTransaction();
         if ($adminData['admin_groupnew'] == 3) {//经销商新增一个公司
             $adminData['admin_groupnew'] = 3;
             $com_data['com_type'] = 2;
@@ -572,11 +572,40 @@ class ServiceProviderController extends BaseController
             $add_ware['company_id'] = $company_id;
             $ware_id = DB::table('warehouse')->insertGetId($add_ware);
         }
+        $adminData = DB::table('admin')
+            ->where('admin_acc', $request['admin_acc'])
+            ->first();
+        $adminData = CommonService::dataToArray($adminData);
+        $adminID = false;
+        $addcer = false;
+        if($adminData){
+            if(isset($request['repeat_acc']) && $request['repeat_acc']!=1){
+                return $this->error('登录名已存在,对应门店【'.$adminData['company_name'].'】，确认为同一店铺请点击确认，非同一门店请修改登录名后重新提交', 6300);
+            }
+            $adminID = $adminData['id'];
+        }
+//        $adminID = DB::table('admin')
+//            ->where('admin_acc', $request['admin_acc'])
+//            ->value('id');
+        if (!$adminID) {
+            $addcer = true;
             $adminID = AdminService::insertData($adminData);
+        }
         if ($adminID) {
+            $infor = DB::table('admin_infor')
+                ->where('admin_id', $adminID)
+                ->where('inf_company_id', $session['company_id'])
+                ->value('id');
+            if ($infor) {
+                return response()->json(['Data' => '', 'ErrorMessage' => '账号名称已存在', 'ErrorCode' => 2]);
+            }
             //保存资料信息
             $adminInfo = $request->only(['phone', 'qq','is_fsix','recom_amount']);
             $adminInfo['admin_id'] = $adminID;
+            $adminInfo['inf_company_id'] = $session['company_id'];
+            $adminInfo['inf_enable'] = $request['enable'];
+            $adminInfo['inf_type'] = $request['type'];
+            $adminInfo['inf_company_name'] = $request['company_name'];
             $adminInfo = $this->_setAdminInfo($adminInfo, $request);
             $infoRes = AdminService::insertAdminInfo($adminInfo);
 
@@ -604,7 +633,7 @@ class ServiceProviderController extends BaseController
                     }
                 }
             }
-
+            if($addcer) {
                 //Certification 设置
                 $faker = $this->_setCertificate($request);
                 $faker['ser_id'] = $adminID;
@@ -613,8 +642,13 @@ class ServiceProviderController extends BaseController
                 //ose_serid 设置
                 $rea = AdminService::insertScoresSend(array('ose_serid' => $adminID));
 
+            }else{
+                $certifRes = true;
+                $rea = true;
+            }
             if ($infoRes && $certifRes && $rea) {
-                $installArr['check_code'] = $faker['certification_num'].'1001';
+                if($addcer) {
+                    $installArr['check_code'] = $faker['certification_num'] . '1001';
                     $installArr['cd_ids'] = 1;
                     $installArr['install_name'] = $adminData['admin_acc'];
                     $installArr['install_phone'] = $adminInfo['phone'];
@@ -625,6 +659,7 @@ class ServiceProviderController extends BaseController
                     $installArr['install_password1'] = $installArr['check_code'];
                     $installArr['install_password'] = md5($installArr['check_code']);
                     InstallPerson::insert($installArr);
+                }
 
                 $content = $session['admin_acc'] . "成员" . $request->input('admin_acc');
                 $this->insertingLog('添加，', '', $content, '服务商管理', $request->ip(), $session['admin_acc']);//日志
@@ -719,6 +754,17 @@ class ServiceProviderController extends BaseController
         if ($request->input('is_ice') == 2) {//发票否
             $adminInfo['service_name'] = trimall($request->input('service_name'));//公司
         }
+        $adminInfo['inf_mouth_pay'] = $request->input('mouth_pay', 1);//结算状态
+        if ($request->input('is_ice') == 1) {//发票 是
+            $adminInfo['inf_deduct'] = $request->input('fdeduct') . ',' . $request->input('deduct');//扣点数值.
+            $adminInfo['inf_invoice'] = $request->input('invoice');//增\普票
+        }
+        if ($request->input('is_ice') == 2) {//发票否
+            $adminInfo['inf_deduct'] = '0,' . $request->input('deduct');//扣点数值.
+            $adminInfo['inf_invoice'] = 3;//增\普票(不开票)
+        }
+        //代理品牌
+        $adminInfo['inf_agent_brand'] = implode(',', $request->input('ad_brand'));
         $adminInfo['admin_dressi'] = trimall($request->input('admin_dressi'));//门店地址
         $adminInfo['account'] = trimall($request->input('account'));//账号
         $adminInfo['khaccount'] = trimall($request->input('khaccount'));//清算单号