edit

app/ExcelTemp/ExcelTemp.php

@@ -930,7 +930,8 @@ trait ExcelTemp
             'SerStatisticsDetail'=>[
                 ['field_name' => '公司名称', 'field_value' => 'company_name', 'field_with' => 45],
                 ['field_name' => '单号', 'field_value' => 'order_num', 'field_with' => 40],
-                ['field_name' => '订单状态', 'field_value' => 'stauas', 'field_with' => 20],
+                ['field_name' => '商品信息', 'field_value' => 'goods_name', 'field_with' => 20],
+                ['field_name' => '订单状态', 'field_value' => 'stauas', 'field_with' => 40],
                 ['field_name' => '派单时间', 'field_value' => 'create_time', 'field_with' => 30],
                 ['field_name' => '接单时间', 'field_value' => 'get_time', 'field_with' => 30],
                 ['field_name' => '反馈时间', 'field_value' => 'feeds_time', 'field_with' => 30],

app/Exports/BasicExport.php

@@ -88,7 +88,7 @@ class BasicExport
         $sheet->getStyle('B1:B2')->applyFromArray($styleArray);
         $sheet->getStyle('B1')->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER);
 
-        $sheet->mergeCells('C1:H1');
+        $sheet->mergeCells('C1:J1');
         $sheet->setCellValue('C1', $data['time']);
         $sheet->getStyle('C1:J1')->applyFromArray($styleArray);
         $sheet->getStyle('C1')->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER);
@@ -96,8 +96,8 @@ class BasicExport
         $sheet->setCellValue('D2', '接单量');
         $sheet->setCellValue('E2', '拒单量');
         $sheet->setCellValue('F2', '拒单率');
-        $sheet->setCellValue('G2', '超十五分钟接单量');
-        $sheet->setCellValue('H2', '超十五分钟比例');
+        $sheet->setCellValue('G2', '超十分钟接单量');
+        $sheet->setCellValue('H2', '超十分钟比例');
         $sheet->setCellValue('I2', '接单时效');
         $sheet->setCellValue('J2', '履约时效');
         $sheet->getStyle('C2:J2')->applyFromArray($styleArray);
@@ -111,8 +111,8 @@ class BasicExport
         $sheet->setCellValue('L2', '接单量');
         $sheet->setCellValue('M2', '拒单量');
         $sheet->setCellValue('N2', '拒单率');
-        $sheet->setCellValue('O2', '超十五分钟接单量');
-        $sheet->setCellValue('P2', '超十五分钟比例');
+        $sheet->setCellValue('O2', '超十分钟接单量');
+        $sheet->setCellValue('P2', '超十分钟比例');
         $sheet->setCellValue('Q2', '接单时效');
         $sheet->setCellValue('R2', '履约时效');
         $sheet->getStyle('K2:R2')->applyFromArray($styleArray);
@@ -330,6 +330,7 @@ class BasicExport
         foreach( $db as $k => $v ){
             $return[$k]['company_name'] = $admindata[$v['ser_id']];//公司名称
             $return[$k]['order_num'] = $v['order_num'];//订单单号
+            $return[$k]['goods_name'] = $v['goods_name'];//商品名称
             $return[$k]['stauas'] = $statusName[$v['stauas']];//订单状态
             $return[$k]['create_time'] = $v['create_time'];//派单时间
             $return[$k]['get_time'] = $v['get_time'];//接单时间

app/Http/Controllers/Api/JdOrderApiController.php

@@ -158,7 +158,7 @@ class JdOrderApiController extends BaseController
 //                                    dd($orders[$kkk]);
                                     $return = OrderaddService::addOrder($orders[$kkk], $session, $ip);
                                     CommonService::addLog('添加定单', json_encode($return), $vvv['orderInfo']['salesChannelOrderId'], 'jdAPI_addOrder');
-                                    if ($return['ErrorCode'] == 1 && $vs['pt_id']!=33) {
+                                    if ($return['ErrorCode'] == 1 && $company_id!=14) {
                                         $url = "http://116.196.75.172/index.php/SaasApiGetOrder/updatestatus?orderId=" . $vvv['orderInfo']['salesChannelOrderId'] . "&storeId=" . $vvv['orderInfo']['warehouseId'];
                                         $urls = $url."&authKey=".$vs['auth_key']."&access_token=".$vs['access_token']."&app_key=".$vs['app_key']."&app_secret=".$vs['app_secret'];
                                         $ck = $this->http_get($urls);

app/Http/Controllers/Api/SynJdPopDataController.php

@@ -295,7 +295,7 @@ class SynJdPopDataController extends BaseController
                                 //    dump($return);
                                 CommonService::addLog('添加定单', json_encode($return), $vv['orderId'],'jd_addOrder');
                                 // $return['ErrorCode'] = 2;
-                                if($return['ErrorCode']==1){
+                                if($return['ErrorCode']==1 && $company_id!=14){
                                     //调用京东出库
 
 

app/Http/Controllers/Api/SynJdSelfDataNewController.php

@@ -263,7 +263,7 @@ class SynJdSelfDataNewController extends BaseController
                     //    dump($return);
                     CommonService::addLog('添加定单', json_encode($return)."--".json_encode($orders[$kk]).'--'.json_encode($goodids), $vv['customOrderId'],'jd_addSelfShhOrder');
                     // $return['ErrorCode'] = 2;
-                    if($return['ErrorCode']==1 && $v['pt_id']!=33){
+                    if($return['ErrorCode']==1 && $company_id!=14){
                         //调用京东出库
 
 

app/Http/Controllers/DataSyn/JdBoundController.php

@@ -3,12 +3,15 @@
 namespace App\Http\Controllers\DataSyn;
 use App\Http\Controllers\BaseController;
 use App\Models\JdBound;
+use App\Models\JdBoundLead;
 use App\Models\PjGoods;
 use App\Services\CommonService;
 use App\Services\JdBoundService;
 use App\Services\PlatformService;
 use Illuminate\Http\Request;
 use BlueCity\Core\Inc\ErrorInc;
+use Excel;
+use DB;
 
 class JdBoundController extends BaseController
 {
@@ -25,6 +28,10 @@ class JdBoundController extends BaseController
 	public function index(Request $request){
 		$input = $request->all();
         $session = $request->get('session_token');
+        $input['status'] = $input['status']??3;
+        if(!in_array($input['status'], [1,2,3,4])){
+            return $this->error('查询状态错误', ErrorInc::INVALID_PARAM);exit;
+        }
     	$list = JdBoundService::getList($input,$session);
     	if($list['list']){
 	    	return $this->success('获取成功', $list); exit;
@@ -76,7 +83,7 @@ class JdBoundController extends BaseController
 				}else{
 					$bding = "永久绑定商品，";
 				}
-				$res = JdBoundService::createjdBound($sku_id, $jd_goodn, $pt_id, $goods_id, $is_long, '', $good_name,$company_id);
+				$res = JdBoundService::createjdBound($sku_id, $jd_goodn, $pt_id, $goods_id, $is_long, '', $good_name,$company_id,$request->get('session_token')['admin_acc']);
 
 				if($res){
 					 $this->insertingLog($bding,'','商品sku：'.$sku_id,'京东商品绑定',$request->ip(), $request->get('session_token')['admin_acc']);//日志
@@ -165,4 +172,164 @@ class JdBoundController extends BaseController
             return $this->error('删除失败', ErrorInc::DATA_EMPTY);exit;
         }
 	}
+
+    /**|---------------------------------------------------------------------------------
+     * @name 上传excel导入
+     * @param file 文件名
+     * @param p_id 平台id
+     * @retrun \Illuminate\Http\JsonResponse
+     * @author dou 2021/12/31 11:57
+     * |---------------------------------------------------------------------------------
+     */
+    public function uploadExcelImport ( Request $request ){
+        try {
+            $file = $request->file('file');
+
+            $p_id = $request->input('p_id');//平台id
+            $session = $request->get('session_token');
+            $admin_acc = $session['admin_acc'];
+
+            if ($session['admin_groupnew'] != 7) {//管理员可以看全部
+                $company_id = $session['company_id'];
+            }else{
+                $company_id = $request->input('company_id')??1;
+            }
+
+            if (!$file){
+                throw new ApiException("请选择文件");
+            }
+            $ext = $file->getClientOriginalExtension();// 获取扩展名
+            if(!in_array($ext,['xls','xlsx','csv'])){//判断格式
+                throw new ApiException("仅支持xls和xlsx结尾的excel文件");
+            }
+            //上传文件
+            $file_name = date('YmdHis').rand(10,99).'.'.$ext;
+            $urlname = public_path('excel');
+            $file->move($urlname,$file_name);
+            $filename = $urlname.'/'.$file_name;
+            Excel::load($filename,function($reader)use($admin_acc,$p_id,$company_id){
+                $reader = $reader->getSheet(0);
+
+                $data = $reader->toArray();
+                if($data[0][0]!='系统编号' && $data[0][1]!='品牌' && $data[0][2]!='系列' && $data[0][3]!='型号名称' && $data[0][4]!='商品全称' && $data[0][5]!='统一商品编码（请勿重复）' && $data[0][6]!='质保时间' && $data[0][7]!='统一结算服务费' && $data[0][8]!='平台' && $data[0][9]!='sku' && $data[0][10]!='平台销售名称'){
+                    throw new \Exception("excel格式错误,请检验表格");
+                }
+                unset($data['0']);
+                $sql = "INSERT IGNORE INTO gone_jd_bound_lead (goods_id,sku_id,is_long,jd_goodn,pt_id,goods_name,company_id,is_state,creactor,state_explain,creact_time,update_time) VALUES ";
+                foreach ($data as $key => $val){
+                    if($this->restrict($data[$key]['0'])!='' && $this->restrict($data[$key]['9'])!='') {
+                        $sqls[] = "('" . $this->restrict($data[$key]['0']) . "','" . $this->restrict($data[$key]['9']) . "','1','" . $this->restrict($data[$key]['10']) . "','" . $p_id . "','" . $this->restrict($data[$key]['4']) . "','" . $company_id . "','1','" . $admin_acc . "','未处理','" . date("Y-m-d H:i:s") . "','" . date("Y-m-d H:i:s") . "')";
+                    }
+                }
+                $sql.=implode(',',$sqls);
+                DB::insert($sql);
+            });
+            if (file_exists($filename)){
+                //echo 11;
+                unlink($filename);
+            }
+            unset($data);
+            $content = '导入了文件'.$filename;
+            $this->insertingLog('导入，','',$content,'绑定sku',$request->ip(),$request->get('session_token')['admin_acc']);
+            return $this->success('导入成功1');
+        }catch(\Exception $e){
+            return $this->error($e->getMessage(), ErrorInc::MYSQL_FAILED);
+        }
+    }
+    //去除空格
+    function restrict($str){
+        $is_str=array(" ","　","\t","\n","\r","	");
+        $is_str_er=array("","","","","","");
+        return str_replace($is_str,$is_str_er,$str);
+    }
+
+    /**|---------------------------------------------------------------------------------
+     * @name 同步绑定
+     * @param string is_type 同步类型1指定同步2批量同步
+     * @param int id 数据id
+     * @retrun \Illuminate\Http\JsonResponse /multitype:array
+     * @author dou 2025/4/10 18:13
+     * |---------------------------------------------------------------------------------
+    */
+	public function sysLeadBound ( Request $request ){
+	    $session = $request->get('session_token');
+	    $input = $request->all();
+        if (!$request->filled('is_type') || !in_array($input['is_type'], [1,2])){
+            return $this->error('操作类型错误', ErrorInc::FAILED_PARAM, []);exit;
+        }
+        if($input['is_type'] == 1) {
+            if (!$request->filled('id')) {
+                return $this->error('缺少数据id', ErrorInc::FAILED_PARAM, []);
+            }
+            $data = JdBoundLead::where('id',$input['id'])->where('is_state',1)->where('company_id',$session['company_id'])->first();
+            if(empty($data)){
+                return $this->error('数据状态错误', ErrorInc::REQUEST_FORBIDDEN);
+            }
+        }else{
+            $data = JdBoundLead::where('is_state',1)->where('company_id',$session['company_id'])->orderBy('id')->first();
+            if(empty($data)){
+                return $this->error('无更多数据', ErrorInc::DATA_EMPTY);
+            }
+        }
+        $data = CommonService::dataToArray($data);
+        $list = JdBound::where('sku_id',$data['sku_id'])->first();
+        $poss['goods_id'] = $data['goods_id'];
+        $poss['jd_goodn'] = $data['jd_goodn'];
+        $poss['pt_id'] = $data['pt_id'];
+        $poss['goods_name'] = $data['goods_name'];
+        $poss['goods_number'] = PjGoods::where("pg_id",$data['goods_id'])->value("version");
+        $poss['company_id'] = $data['company_id'];
+        DB::beginTransaction();
+        if($list){
+            $res = JdBound::where('sku_id',$data['sku_id'])->update($poss);
+            $content = '绑定编辑sku:'.$data['sku_id'].';id='.$data['id'];
+        }else{
+            $poss['is_long'] = $data['is_long'];
+            $poss['sku_id'] = $data['sku_id'];
+            $res = JdBound::insert($poss);
+            $content = '绑定添加sku:'.$data['sku_id'].';id='.$data['id'];
+        }
+        if($res){
+            $rea = JdBoundLead::where('id',$data['id'])->update(['is_state'=>3,'state_explain'=>'绑定成功','update_time'=>date("Y-m-d H:i:s")]);
+            if($rea){
+                $this->insertingLog("绑定，",$data['sku_id'],$content,"平台商品绑定",$request->ip(),$request->get('session_token')['admin_acc']);//日志
+                DB::commit();
+                return $this->success('操作成功'); exit;
+            }else{
+                DB::rollback();
+                return $this->error('操作失败', ErrorInc::MYSQL_STEP_FAILED, []);
+            }
+        }else{
+            DB::rollback();
+            $rea = JdBoundLead::where('id',$data['id'])->update(['is_state'=>2,'state_explain'=>'同步失败','update_time'=>date("Y-m-d H:i:s")]);
+            return $this->error('操作失败', ErrorInc::MYSQL_STEP_FAILED, []);
+        }
+	}
+
+	/**|---------------------------------------------------------------------------------
+	 * @name 忽略数据
+	 * @param string id 数据id
+	 * @retrun \Illuminate\Http\JsonResponse
+	 * @author dou 2025/4/10 18:59
+	 * |---------------------------------------------------------------------------------
+	*/
+	public function deleteLeadBound ( Request $request ){
+        $input = $request->all();
+        if (!$request->filled('id')) {
+            return $this->error('缺少数据id', ErrorInc::FAILED_PARAM, []);
+        }
+        $data = JdBoundLead::where('id',$input['id'])->where('is_state',2)->first();
+        $data = CommonService::dataToArray($data);
+        if(empty($data) || $data['is_state']!=2){
+            return $this->error('数据状态错误', ErrorInc::REQUEST_FORBIDDEN);
+        }
+        $rea = JdBoundLead::where('id',$data['id'])->update(['is_state'=>4,'state_explain'=>'已忽略','update_time'=>date("Y-m-d H:i:s")]);
+        if($rea){
+            $content = '忽略数据sku:'.$data['sku_id'].';id='.$data['id'];
+            $this->insertingLog("忽略，",$data['sku_id'],$content,"平台商品绑定",$request->ip(),$request->get('session_token')['admin_acc']);//日志
+            return $this->success('操作成功');
+        }else{
+            return $this->error('操作失败', ErrorInc::MYSQL_STEP_FAILED, []);
+        }
+	}
 }

app/Http/Controllers/DataSyn/JdSynchronousController.php

@@ -109,7 +109,7 @@ class JdSynchronousController extends BaseController
                 $goods_name = $goods_info['brand_name'].'-'.$goods_info['pg_series'].'-'.$goods_info['version'];
             }
 			if($goods_info){
-				$res = JdBoundService::createjdBound($jdgoods['sku_id'], $jdgoods['sku_name'], $jdgoods['pt_id'], $goods_id, $is_long, '', $goods_name,$request->get("session_token")['company_id']);
+				$res = JdBoundService::createjdBound($jdgoods['sku_id'], $jdgoods['sku_name'], $jdgoods['pt_id'], $goods_id, $is_long, '', $goods_name,$request->get("session_token")['company_id'],$request->get('session_token')['admin_acc']);
 				if($res){
 					if($is_long==1){
 						$bding = "永久绑定商品，";

app/Http/Controllers/DatasBase/BservissController.php

@@ -122,20 +122,20 @@ class BservissController extends BaseController
         }
     }
     /**
-     * @name 获取城市
+     * @name 获取省份
      * @param are_name
      * @param Request $request
      * @return mixed
      * @author du
      * @date 2021/8/30
      */
-    public function search_shi (Request $request)
+    public function search_sheng (Request $request)
     {
         if ($request->filled('are_name')){
             $are_name = $request->input('are_name');
             $list = DB::table('disareanew')->where(function ($query)use($are_name){
-                $query->where('are_shi','like',"%{$are_name}%")->orWhere('are_sheng','like',"%{$are_name}%")->where('are_state',1);
-            })->select('are_sid','are_sheng','are_shi')->groupBy('are_shi')->get();
+                $query->Where('are_sheng','like',"%{$are_name}%")->where('are_state',1);
+            })->select('are_sid','are_sheng','are_shid')->groupBy('are_shid')->get();
             if (!$list->isEmpty()){
                 return $this->success('获取成功',$list);exit;
             }else{
@@ -145,6 +145,50 @@ class BservissController extends BaseController
             return $this->error('参数错误', ErrorInc::FAILED_PARAM);
         }
     }
+    /**
+     * @name 获取城市
+     * @param are_name
+     * @param Request $request
+     * @return mixed
+     * @author du
+     * @date 2021/8/30
+     */
+    public function search_shi (Request $request)
+    {
+        if(!$request->filled('search_type') || $request->input('search_type')==1) {
+            if ($request->filled('are_name')) {
+                $are_name = $request->input('are_name');
+                $list = DB::table('disareanew')->where(function ($query) use ($are_name) {
+                    $query->where('are_shi', 'like', "%{$are_name}%")->orWhere('are_sheng', 'like', "%{$are_name}%")->where('are_state', 1);
+                })->select('are_sid', 'are_sheng', 'are_shi')->groupBy('are_shi')->get();
+                if (!$list->isEmpty()) {
+                    return $this->success('获取成功', $list);
+                    exit;
+                } else {
+                    return $this->error('暂无数据', ErrorInc::DATA_EMPTY);
+                    exit;
+                }
+            } else {
+                return $this->error('参数错误', ErrorInc::FAILED_PARAM);
+            }
+        }else{
+            if ($request->filled('are_shid')) {
+                $are_shid = $request->input('are_shid');
+                $list = DB::table('disareanew')->where(function ($query) use ($are_shid) {
+                    $query->where('are_shid',$are_shid)->where('are_state', 1);
+                })->select('are_sid', 'are_shi', 'are_sheng')->groupBy('are_shi')->get();
+                if (!$list->isEmpty()) {
+                    return $this->success('获取成功', $list);
+                    exit;
+                } else {
+                    return $this->error('暂无数据', ErrorInc::DATA_EMPTY);
+                    exit;
+                }
+            } else {
+                return $this->error('参数错误', ErrorInc::FAILED_PARAM);
+            }
+        }
+    }
 
     /**
      * @name 获取包含的区域
@@ -213,11 +257,15 @@ class BservissController extends BaseController
      */
     public function search_company (Request $request)
     {
-        if ($request->filled('are_sheng') && $request->filled('are_shi')){
+        if ($request->filled('are_sheng')){
             $are_sheng = $request->input('are_sheng');
             $are_shi = $request->input('are_shi');
             $serid = Bserviss::distinct()->pluck('bs_serid')->toArray();
-            $adminRes = AdminInfor::where('admin_province','like',"%{$are_sheng}%")->Where('admin_city','like',"%{$are_shi}%")->select('admin_id')->get();
+            $adminRes = AdminInfor::where('admin_province','like',"%".$are_sheng."%");
+            if($request->filled('are_shi')){
+                $adminRes = $adminRes->Where('admin_city', 'like', "%".$are_shi."%");
+            }
+            $adminRes = $adminRes->select('admin_id')->get();
             if (!$adminRes->isEmpty()){
                 $list = [];
                 $num = -1;
@@ -232,6 +280,7 @@ class BservissController extends BaseController
                 }
                 if ($list){
                     foreach ($list as $ks => $vs){
+                        $list[$ks]['exist'] = false;
                         if (in_array($vs['admin_id'],$serid)){
                             $list[$ks]['type'] = 2;
                         }else{
@@ -263,19 +312,41 @@ class BservissController extends BaseController
      */
     public function searchService (Request $request)
     {
-        if (!$request->filled('company_name')||!$request->filled('are_sid')){
+        if (!$request->filled('company_name')||(!$request->filled('are_sid')&&!$request->filled('are_shid'))){
             return $this->error('参数错误无company_name或无are_sid', ErrorInc::FAILED_PARAM);
         }
         $session = $request->get('session_token');
         $company_name = $request->input('company_name');
-        $are_sid = $request->input('are_sid');
-        $serid = Bserviss::distinct()->where('bs_sid',$are_sid)->pluck('bs_serid')->toArray();
+        if($request->filled('are_sid')){
+            $are_sid[] = $request->input('are_sid');
+        }elseif($request->filled('are_shid')){
+            $are_shid = $request->input('are_shid');
+            $are_sid = DB::table('disareanew')->where('are_shid',$are_shid)->where('are_state', 1)->select('are_sid', 'are_shi', 'are_sheng')->groupBy('are_shi')->pluck('are_sid');
+        }else{
+            return $this->error('数据异常', ErrorInc::FAILED_PARAM);
+        }
+//        $are_sid = $request->input('are_sid');
+        $serid = Bserviss::distinct()->whereIn('bs_sid',$are_sid)->pluck('bs_serid')->toArray();
+        $serid = CommonService::dataToArray($serid);
         if (!in_array($session['admin_groupnew'],[7,8])) {
-            $list = DB::table('admin')->whereNotIn('id', $serid)->where('admin_groupnew', 2)->where('company_id', $request->get('session_token')['company_id'])->where('company_name', 'like', '%' . $company_name . '%')->select('id', 'company_name')->orderBy('id', 'ASC')->limit('10')->get();
+            $list = DB::table('admin')->where('admin_groupnew', 2)->where('company_id', $session['company_id'])->where('company_name', 'like', '%' . $company_name . '%')->select('id', 'company_name')->orderBy('id', 'ASC')->limit('10')->get();//->whereNotIn('id', $serid)
         }else{
-            $list = DB::table('admin')->whereNotIn('id', $serid)->whereIn('admin_groupnew', [2,3])->whereIn('company_id', $session['all_company'])->where('company_name', 'like', '%' . $company_name . '%')->select('id', 'company_name')->orderBy('id', 'ASC')->limit('10')->get();
+            $list = DB::table('admin')->whereIn('admin_groupnew', [2,3])->whereIn('company_id', $session['all_company'])->where('company_name', 'like', '%' . $company_name . '%')->select('id', 'company_name')->orderBy('id', 'ASC')->limit('10')->get();//->whereNotIn('id', $serid)
         }
         if (!$list->isEmpty()){
+            $list = CommonService::dataToArray($list);
+            foreach($list as $k => $v){
+                if($serid){
+                    if(in_array($v['id'], $serid)){
+                        $list[$k]['exist'] = true;
+                    }else{
+                        $list[$k]['exist'] = false;
+                    }
+                }else{
+                    $list[$k]['exist'] = false;
+                }
+
+            }
             return $this->success('获取成功',$list);exit;
         }else{
             return $this->error('暂无数据', ErrorInc::DATA_EMPTY);exit;
@@ -494,11 +565,31 @@ class BservissController extends BaseController
             $list = $request->input('list');
             $listArr = [];
             $vv = 0;
+            $add_type = $request->input('add_type')??2;
             foreach ($list as $k=>$v){
                 foreach ($v['brand_data'] as $ks=>$vs){
+                    if($add_type==1) {
+                        foreach ($vs['areachech'] as $ka => $va) {
+                            $listArr[$vv]['bs_serid'] = $v['admin_id'];
+                            $are_xid = DB::table('disareanew')->where('are_sid', $va)->where('are_state', 1)->pluck('are_id');//
+                            if($are_xid) {
+                                $are_xid = CommonService::dataToArray($are_xid);
+                                $listArr[$vv]['bs_areid'] = implode(',', $are_xid);
+                                $listArr[$vv]['bs_sid'] = $va;
+                                $listArr[$vv]['bs_branid'] = $vs['bs_branid'];
+                                $listArr[$vv]['bs_brantype'] = $vs['bs_brantype'];
+                                $listArr[$vv]['bs_max'] = $vs['bs_max'];
+                                $listArr[$vv]['bs_min'] = $vs['bs_min'];
+                                $listArr[$vv]['bs_creactime'] = date('Y-m-d H:i:s');
+                                $listArr[$vv]['bs_creactid'] = $request->get('session_token')['admin_name'];
+                                $vv++;
+                            }else{
+                                return $this->error('数据异常', ErrorInc::MYSQL_FAILED,$va);exit;
+                            }
+                        }
+                    }elseif ($add_type==2) {
                         $listArr[$vv]['bs_serid'] = $v['admin_id'];
-//                    $listArr[$vv]['bs_areid'] = implode(',',$v['areachech']);
-                    $listArr[$vv]['bs_areid'] = implode(',',$vs['areachech']);
+                        $listArr[$vv]['bs_areid'] = implode(',', $vs['areachech']);
                         $listArr[$vv]['bs_sid'] = $request->input('are_sid');
                         $listArr[$vv]['bs_branid'] = $vs['bs_branid'];
                         $listArr[$vv]['bs_brantype'] = $vs['bs_brantype'];
@@ -507,7 +598,13 @@ class BservissController extends BaseController
                         $listArr[$vv]['bs_creactime'] = date('Y-m-d H:i:s');
                         $listArr[$vv]['bs_creactid'] = $request->get('session_token')['admin_name'];
                         $vv++;
+                    }else{
+                        return $this->error('添加类型错误', ErrorInc::BUSINESS_FORBID);exit;
+                    }
+                }
             }
+            if(empty($listArr)){
+                return $this->error('数据异常', ErrorInc::MYSQL_FAILED,$listArr);exit;
             }
             $res = DB::table('bservisnew')->insert($listArr);
             if ($res){

app/Http/Controllers/DatasBase/TipsController.php

@@ -8,6 +8,7 @@ use App\Models\OrderList;
 use App\Models\Orders;
 use App\Models\Refund;
 use App\Models\SendGoods;
+use App\Models\SubmitPlease;
 use App\Services\BmmcService;
 use App\Services\CommonService;
 use BlueCity\Core\Inc\ErrorInc;
@@ -66,6 +67,13 @@ class TipsController extends BaseController
             $list[$num]['count'] = $timeout;
             $list[$num]['url'] = 'Ordersystem/orders';
         }
+        $submit_stauas = SubmitPlease::whereIn('submit_stauas',[1,4,5,6,7])->where('company_id',$request->get('session_token')['company_id'])->count();
+        if($submit_stauas>0){
+            $num = count($list);
+            $list[$num]['msg'] = "存在未处理的退收款";
+            $list[$num]['count'] = $submit_stauas;
+            $list[$num]['url'] = 'Financialsystem/SubmitPlease';
+        }
         $date = time();
         $time = mktime(17,0,0,date('m'),date('d'),date('Y'));
         $eight =  $date -'28800';

app/Http/Controllers/ExcelInfo/ExceloutController.php

@@ -1130,7 +1130,7 @@ public function performBserviStore($res,$con='BserviStore'){
                             } elseif ($vg == 'goods_brand') {
                                 $rs[$k][$kg] = $goodsnames[$v['msg_id']]['goods_brand'];
                             }elseif($vg == 'goods_number'){
-                                $rs[$k][$kg] = mb_ereg_replace($v['goods_brand']."-",'',$goodsnames[$v['msg_id']]['goods_name']);
+                                $rs[$k][$kg] = $goodsnames[$v['msg_id']]['goods_name'];//mb_ereg_replace($v['goods_brand']."-",'',$goodsnames[$v['msg_id']]['goods_name']);
                             }
                             elseif ($vg == 'goods_num') {
                                 $rs[$k][$kg] = $goodsnames[$v['msg_id']]['goods_num'];

app/Http/Controllers/ExcelInfo/ExcelpermissController.php

@@ -149,6 +149,7 @@ class ExcelpermissController extends BaseController
             $adg_action = CommonService::dataToArray($adg_action);
             if($adg_action) {
                 $list = CommonService::arrayFilterFieldValue($list, [['action_value' => $adg_action]]);
+                $list = CommonService::resetListKey($list);
             }else{
                 $list = [];
             }

app/Http/Controllers/Orders/OrdersController.php

@@ -538,7 +538,7 @@ class OrdersController extends BaseController
         if($checkKey['code']!=1){
             return $this->error('参数'.$checkKey['data'].'未填写,或值为空', ErrorInc::INVALID_PARAM);exit;
         }
-        $orderinfo = OrderService::getOrderBy('sys_num',  $input['sys_num'],['order_num', 'order_status','customer_id','ser_id','store_type','p_id','category']);
+        $orderinfo = OrderService::getOrderBy('sys_num',  $input['sys_num'],['order_num', 'order_status','customer_id','ser_id','store_type','p_id','category','company_id']);
 
         $serial = OrderListService::getOrderListBy('sys_num',  $input['sys_num'] ,'first',['serial_number']);
         $input['order_status'] = $orderinfo['order_status'];
@@ -586,7 +586,10 @@ class OrdersController extends BaseController
                 $ArrSett['locksel_type'] = 1;//未锁定
                 $submit_stauas = 2;//差额处理，2确认申请
             }
-            $returnPlease = SubmitPleaseService::createSubmitPlease($session['admin_acc'],$input['pt_id'],$input['sys_num'],$input['goods_name_new'],$input['submit_money'],$input['goods_state'],4,2,0,$submit_stauas,$input['msg_id'],$session['company_id']);
+            if(!isset($session['company_id']) || $session['company_id']=='' || $session['company_id']==0){
+                $session['company_id'] = $orderinfo['company_id'];
+            }
+            $returnPlease = SubmitPleaseService::createSubmitPlease($session['admin_acc'],$input['pt_id'],$input['sys_num'],$input['goods_name_new'],$input['submit_money'],$input['goods_state'],4,2,0,$submit_stauas,$input['msg_id'],0,'','',1,0,$session['company_id']);
             if ($returnPlease) {
                 if (!empty($sett_status['sett_status'])) {
                     SettlementList::where(['sys_num' => $input['sys_num'], 'msg_id' => $input['msg_id']])->update($ArrSett);

app/Http/Controllers/Service/SupplierPriceController.php

@@ -15,6 +15,10 @@
 namespace App\Http\Controllers\Service;
 
 use App\Http\Controllers\BaseController;
+use App\Models\Admin;
+use App\Models\GhPrice;
+use App\Models\GhPriceLead;
+use App\Models\PjGoods;
 use App\Services\AdminService;
 use App\Services\CommonService;
 use App\Services\GoodsService;
@@ -23,6 +27,7 @@ use BlueCity\Core\Inc\ErrorInc;
 use BlueCity\Core\Traits\CurdControllerMethod;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Excel;
 
 class SupplierPriceController extends BaseController
 {
@@ -397,4 +402,184 @@ public function index(Request $request)
         $content = "删除供货价，编号：" . $entity->id . ";服务门店：". $company. ";商品：" . $entity->gh_gname . "(" . $entity->supply_price . ")";
         $this->insertingLog('删除，', '', $content, '供货价管理', Request()->ip(), Request()->get('session_token')['admin_acc']);
     }
+
+    /**|---------------------------------------------------------------------------------
+     * @name 上传excel导入
+     * @param file 文件名
+     * @retrun \Illuminate\Http\JsonResponse /multitype:array
+     * @author dou 2025/4/11 15:03
+     * |---------------------------------------------------------------------------------
+    */
+    public function uploadExcelImport ( Request $request ){
+        try {
+            $file = $request->file('file');
+            $session = $request->get('session_token');
+            $admin_acc = $session['admin_acc'];
+
+            if ($session['admin_groupnew'] != 7) {//管理员可以看全部
+                $company_id = $session['company_id'];
+            }else{
+                $company_id = $request->input('company_id')??1;
+            }
+
+            if (!$file){
+                throw new ApiException("请选择文件");
+            }
+            $ext = $file->getClientOriginalExtension();// 获取扩展名
+            if(!in_array($ext,['xls','xlsx','csv'])){//判断格式
+                throw new ApiException("仅支持xls和xlsx结尾的excel文件");
+            }
+            //上传文件
+            $file_name = date('YmdHis').rand(10,99).'.'.$ext;
+            $urlname = public_path('excel');
+            $file->move($urlname,$file_name);
+            $filename = $urlname.'/'.$file_name;
+            Excel::load($filename,function($reader)use($admin_acc,$company_id){
+                $reader = $reader->getSheet(0);
+
+                $data = $reader->toArray();
+                if($data[0][0]!='商品编号' && $data[0][1]!='商品名称' && $data[0][2]!='服务商id' && $data[0][3]!='服务商名称' && $data[0][4]!='结算价格' && $data[0][5]!='生效日期' && $data[0][6]!='备注'){
+                    throw new \Exception("excel格式错误,请检验表格");
+                }
+                unset($data['0']);
+                $sql = "INSERT IGNORE INTO gone_gh_price_lead (gh_price_name,goods_id,ser_id,ser_name,create_time,remarks,supply_price,gh_gname,company_id,start_date,update_time,is_state,state_explain) VALUES ";
+                $sqls = [];
+                foreach ($data as $key => $val){
+                    if($data[$key]['4']!='' && $data[$key]['4']!=0 && $data[$key]['0']!='' && $data[$key]['0']!=0) {
+                        $sqls[] = "(
+                        '" . $admin_acc . "',
+                        '" . $this->restrict($data[$key]['0']) . "',
+                        '" . $this->restrict($data[$key]['2']) . "',
+                        '" . $this->restrict($data[$key]['3']) . "',
+                        '" . date("Y-m-d H:i:s") . "',
+                        '" . $this->restrict($data[$key]['6']) . "',
+                        '" . $this->restrict($data[$key]['4']) . "',
+                        '" . $this->restrict($data[$key]['1']) . "',
+                        '" . $company_id . "',
+                        '" . $this->restrict($data[$key]['5']) . "',
+                        '" . date("Y-m-d H:i:s") . "',
+                        '1',
+                        '未处理'
+                        )";
+                    }
+                }
+                if(empty($sqls)){
+                    throw new \Exception("无有效数据,请检验表格");
+                }
+                $sql.=implode(',',$sqls);
+                DB::insert($sql);
+            });
+            if (file_exists($filename)){
+                //echo 11;
+                unlink($filename);
+            }
+            unset($data);
+            $content = '导入了文件'.$filename;
+            $this->insertingLog('导入，','',$content,'绑定sku',$request->ip(),$request->get('session_token')['admin_acc']);
+            return $this->success('导入成功1');
+        }catch(\Exception $e){
+            return $this->error($e->getMessage(), ErrorInc::MYSQL_FAILED);
+        }
+    }
+    //去除空格
+    function restrict($str){
+        $is_str=array(" ","　","\t","\n","\r","	");
+        $is_str_er=array("","","","","","");
+        return str_replace($is_str,$is_str_er,$str);
+    }
+
+    /**|---------------------------------------------------------------------------------
+     * @name 同步绑定
+     * @param string is_type 同步类型1指定同步2批量同步
+     * @param int id 数据id
+     * @retrun \Illuminate\Http\JsonResponse /multitype:array
+     * @author dou 2025/4/10 18:13
+     * |---------------------------------------------------------------------------------
+     */
+    public function sysLeadData ( Request $request ){
+        $session = $request->get('session_token');
+        $input = $request->all();
+        if (!$request->filled('is_type') || !in_array($input['is_type'], [1,2])){
+            return $this->error('操作类型错误', ErrorInc::FAILED_PARAM, []);
+        }
+        if($input['is_type'] == 1) {
+            if (!$request->filled('id')) {
+                return $this->error('缺少数据id', ErrorInc::FAILED_PARAM, []);
+            }
+            $data = GhPriceLead::where('id',$input['id'])->where('is_state',1)->where('company_id',$session['company_id'])->first();
+            if(empty($data)){
+                return $this->error('数据状态错误', ErrorInc::REQUEST_FORBIDDEN);
+            }
+        }else{
+            $data = GhPriceLead::where('is_state',1)->orderBy('id')->where('company_id',$session['company_id'])->first();
+            if(empty($data)){
+                return $this->error('无更多数据', ErrorInc::DATA_EMPTY);
+            }
+        }
+        $data = CommonService::dataToArray($data);
+        if($data['ser_id'] != 0 && $data['ser_name'] == '统一结算价'){
+            $res = GhPriceLead::where('id',$data['id'])->where('is_state',1)->update(['is_state'=>'2','state_explain'=>'服务商异常','update_time'=>date("Y-m-d H:i:s")]);
+        }else{
+            $poss['gh_price_name'] = $data['gh_price_name'];
+            $poss['goods_id'] = $data['goods_id'];
+            $poss['remarks'] = $data['remarks'];
+            $poss['supply_price'] = $data['supply_price'];
+            $poss['gh_gname'] = $data['gh_gname'];
+            $poss['start_date'] = $data['start_date'];
+            if($data['ser_id'] > 0 && $data['ser_name']=='统一结算价'){
+                $res = GhPriceLead::where('id',$data['id'])->where('is_state',1)->update(['is_state'=>'2','state_explain'=>'服务商id与服务商名称不符','update_time'=>date("Y-m-d H:i:s")]);
+                return $this->error('操作失败', ErrorInc::MYSQL_STEP_FAILED, []);
+            }else{
+                $poss['ser_id'] = $data['ser_id'];
+                if($data['ser_name']!='统一结算价'){
+                    $ser_id = Admin::where("company_name",$data['ser_name'])->value("id");
+                    if(empty($ser_id) || $data['ser_id']!=$ser_id){
+                        $res = GhPriceLead::where('id',$data['id'])->where('is_state',1)->update(['is_state'=>'2','state_explain'=>'服务商id与服务商名称不符','update_time'=>date("Y-m-d H:i:s")]);
+                        return $this->error('操作失败', ErrorInc::MYSQL_STEP_FAILED, []);
+                    }
+                }
+            }
+            $pg_goodsname = PjGoods::where("pg_id",$data['goods_id'])->where('is_delect',1)->value('pg_goodsname');
+            if(empty($pg_goodsname)){
+                $res = GhPriceLead::where('id',$data['id'])->where('is_state',1)->update(['is_state'=>'2','state_explain'=>'商品编号不存在','update_time'=>date("Y-m-d H:i:s")]);
+                return $this->error('操作失败', ErrorInc::MYSQL_STEP_FAILED, []);
+            }
+            $list = GhPrice::where("goods_id",$poss['goods_id'])
+                ->where("ser_id",$poss['ser_id'])
+                ->where("company_id",$poss['company_id'])
+                ->where("start_date",$poss['start_date'])
+                ->value('supply_price');
+            DB::beginTransaction();
+            if(!$list) {
+                $poss['create_time'] = date("Y-m-d H:i:s");
+                $poss['company_id'] = $data['company_id'];
+                $poss['type'] = $data['type'];
+                $rea = GhPrice::insert($poss);
+                $content = '添加商品:'.$poss['gh_gname'].'('.$poss['goods_id'].')：'.$poss['supply_price'];
+            }else{
+                $poss['update_time'] = date("Y-m-d H:i:s");
+                $rea = GhPrice::where("goods_id",$poss['goods_id'])
+                    ->where("ser_id",$poss['ser_id'])
+                    ->where("start_date",$poss['start_date'])
+                    ->where("company_id",$poss['company_id'])
+                    ->uptate($poss);
+                $content = '编辑商品:'.$poss['gh_gname'].'('.$poss['goods_id'].')：'.$list.'->'.$poss['supply_price'];
+            }
+            if($rea){
+                $res = GhPriceLead::where('id',$data['id'])->where('is_state',1)->update(['is_state'=>'3','state_explain'=>'添加成功','update_time'=>date("Y-m-d H:i:s")]);
+                if($res){
+                    $this->insertingLog("同步结算价，",$poss['goods_id'],$content,"供货价格管理",$request->ip(),$request->get('session_token')['admin_acc']);//日志
+                    DB::commit();
+                    return $this->success('操作成功'); exit;
+                }else{
+                    DB::rollback();
+                    return $this->error('操作失败', ErrorInc::MYSQL_STEP_FAILED, []);
+                }
+            }else{
+                DB::rollback();
+                $rea = JdBoundLead::where('id',$data['id'])->update(['is_state'=>2,'state_explain'=>'同步失败','update_time'=>date("Y-m-d H:i:s")]);
+                return $this->error('操作失败', ErrorInc::MYSQL_STEP_FAILED, []);
+            }
+        }
+    }
 }

app/Http/Controllers/User/AdminsController.php

@@ -182,7 +182,7 @@ class AdminsController extends BaseController
             ->where('company_id', $admins['company_id'])
             ->where('admin_groupnew', "!=" ,2)
             ->count();
-        if ($find_data >= 5) {
+        if ($find_data >= 5 && !in_array($admins['company_id'],[14])) {
             return $this->error('添加数量超出限制', ErrorInc::MYSQL_FAILED, []);
         }
 

app/Models/GhPriceLead.php

+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class GhPriceLead extends Model
+{
+    protected $table ='gh_price_lead';
+    protected $guarded = [];
+    public $timestamps=false;
+}

app/Models/JdBoundLead.php

+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class JdBoundLead extends Model
+{
+    protected $table ='jd_bound_lead';
+    protected $guarded = [];
+    public $timestamps = false;
+}

app/Services/Api/MobileWeb/OrderListService.php

@@ -1548,22 +1548,22 @@ class OrderListService extends Model
     public static function getPicName ( $type ){
         switch ( $type ){
             case 1:
-                $typeName='安装确认单';
+                $typeName='客户确认单';
                 break;
             case 2:
-                $typeName='安装后图片';
+                $typeName='电池上车图';
                 break;
             case 3:
                 $typeName='车牌号图片';
                 break;
             case 4:
-                $typeName='不断电安装';
+                $typeName='批次号';
                 break;
             case 5:
-                $typeName='生产日期';
+                $typeName='仪表盘/大众防伪码';
                 break;
             case 6:
-                $typeName='电子质保单';
+                $typeName='电子保单/大众验真';
                 break;
             default:
                 $typeName='其它';

app/Services/DataStatisticsService.php

@@ -44,22 +44,27 @@ class DataStatisticsService extends Service{
             }if($input['search_type'] == 'month') {
                 $time_end = date("Y-m-d", strtotime($input['time_start'] . " +1 month"));
             }
+            if(isset($input['goods_brand']) && !empty($input['goods_brand'])){
+                $where = " and gone_orders.goods_brand='".$input['goods_brand']."'";
+            }
             foreach($admindata as $k => $v){
-                $order_listnum = OrderList::whereRaw("ser_id='".$v['id']."' and create_time BETWEEN '".$time_start."' and '".$time_end."' and is_delete=1 and get_time != '' and company_id = '".$session['company_id']."'")->count();//接单数量
+                $order_listnum = OrderList::leftjoin('orders', 'orders.order_num', '=', 'order_list.order_num')->whereRaw("gone_order_list.ser_id='".$v['id']."' and gone_order_list.create_time BETWEEN '".$time_start."' and '".$time_end."' and gone_order_list.is_delete=1 and gone_order_list.get_time != '' and gone_order_list.company_id = '".$session['company_id']."'".$where)->count();//接单数量
 //                $order_listnums = OrderList::whereRaw("ser_id='".$v['id']."' and create_time BETWEEN '".$time_start."' and '".$time_end."' and is_delete=1 and company_id = '".$session['company_id']."'")->count();//工单数量
-                $order_rejectednum = OrderRejected::leftjoin('orders', 'or_order_num', '=', 'order_num')->whereRaw("or_ser_id='".$v['id']."' and or_creact_time BETWEEN '".$time_start."' and '".$time_end."' and or_show=1 and or_type = 1 and company_id = '".$session['company_id']."'")->count();//拒单数量
-                $order_fivenum = OrderRejected::leftjoin('orders', 'or_order_num', '=', 'order_num')->whereRaw("or_ser_id='".$v['id']."' and or_creact_time BETWEEN '".$time_start."' and '".$time_end."' and order_status<50 and or_show=1 and or_type = 2 and company_id = '".$session['company_id']."'")->count();//拒单数量
-                $order_listAllnum = OrderList::whereRaw("ser_id='".$v['id']."' and create_time BETWEEN '2024-08-19' and '".$time_end."' and is_delete=1 and get_time != '' and company_id = '".$session['company_id']."'")->count();//总接单数量
+                $order_rejectednum = OrderRejected::leftjoin('orders', 'or_order_num', '=', 'order_num')->whereRaw("or_ser_id='".$v['id']."' and or_creact_time BETWEEN '".$time_start."' and '".$time_end."' and or_show=1 and or_type = 1 and company_id = '".$session['company_id']."'".$where)->count();//拒单数量
+//                $order_fivenum = OrderRejected::leftjoin('orders', 'or_order_num', '=', 'order_num')->whereRaw("or_ser_id='".$v['id']."' and or_creact_time BETWEEN '".$time_start."' and '".$time_end."' and order_status<50 and or_show=1 and or_type = 2 and company_id = '".$session['company_id']."'")->count();//拒单数量
+                $order_fivenum = OrderList::leftjoin('orders', 'orders.order_num', '=', 'order_list.order_num')->whereRaw("gone_order_list.ser_id='".$v['id']."' and ((gone_order_list.get_time = '' and (UNIX_TIMESTAMP('".date("Y-m-d H:i:s")."')-UNIX_TIMESTAMP(gone_order_list.create_time)>600)) or (UNIX_TIMESTAMP(gone_order_list.get_time)-UNIX_TIMESTAMP(gone_order_list.create_time))>600) and gone_order_list.create_time BETWEEN '".$time_start."' and '".$time_end."' and gone_order_list.is_delete = 1 and gone_order_list.company_id = '".$session['company_id']."' and time(gone_order_list.create_time)>='08:30:00' and time(gone_order_list.create_time)<='18:00:00'".$where)->count();//超十分钟未接单数量
+                $order_listAllnum = OrderList::leftjoin('orders', 'orders.order_num', '=', 'order_list.order_num')->whereRaw("gone_order_list.ser_id='".$v['id']."' and gone_order_list.create_time BETWEEN '2024-08-19' and '".$time_end."' and gone_order_list.is_delete=1 and gone_order_list.get_time != '' and gone_order_list.company_id = '".$session['company_id']."'".$where)->count();//总接单数量
 //                $order_listAllnums = OrderList::whereRaw("ser_id='".$v['id']."' and create_time BETWEEN '2024-08-19' and '".$time_end."' and is_delete=1 and company_id = '".$session['company_id']."'")->count();//工单数量
-                $order_rejectedAllnum = OrderRejected::leftjoin('orders', 'or_order_num', '=', 'order_num')->whereRaw("or_ser_id='".$v['id']."' and or_creact_time BETWEEN '2024-08-19' and '".$time_end."' and or_show=1 and or_type = 1 and company_id = '".$session['company_id']."'")->count();//总拒单数量
-                $order_fiveAllnum = OrderRejected::leftjoin('orders', 'or_order_num', '=', 'order_num')->whereRaw("or_ser_id='".$v['id']."' and or_creact_time BETWEEN '2024-08-19' and '".$time_end."' and order_status<50 and or_show=1 and or_type = 2 and company_id = '".$session['company_id']."'")->count();//总拒单数量
-                $sql = "SELECT CAST((SUM(UNIX_TIMESTAMP(feeds_time))-SUM(UNIX_TIMESTAMP(get_time)))/COUNT(id) as SIGNED) as timenum FROM gone_order_list WHERE ser_id='".$v['id']."' and get_time != '' and get_time!='0000-00-00 00:00:00' and feeds_time != '' and feeds_time!='0000-00-00 00:00:00' and create_time BETWEEN '".$time_start."' and '".$time_end."' and is_delete=1 and company_id = '".$session['company_id']."'";
+                $order_rejectedAllnum = OrderRejected::leftjoin('orders', 'or_order_num', '=', 'order_num')->whereRaw("or_ser_id='".$v['id']."' and or_creact_time BETWEEN '2024-08-19' and '".$time_end."' and or_show=1 and or_type = 1 and company_id = '".$session['company_id']."'".$where)->count();//总拒单数量
+//                $order_fiveAllnum = OrderRejected::leftjoin('orders', 'or_order_num', '=', 'order_num')->whereRaw("or_ser_id='".$v['id']."' and or_creact_time BETWEEN '2024-08-19' and '".$time_end."' and order_status<50 and or_show=1 and or_type = 2 and company_id = '".$session['company_id']."'")->count();//总拒单数量
+                $order_fiveAllnum = OrderList::leftjoin('orders', 'orders.order_num', '=', 'order_list.order_num')->whereRaw("gone_order_list.ser_id='".$v['id']."' and ((gone_order_list.get_time = '' and (UNIX_TIMESTAMP('".date("Y-m-d H:i:s")."')-UNIX_TIMESTAMP(gone_order_list.create_time)>600)) or (UNIX_TIMESTAMP(gone_order_list.get_time)-UNIX_TIMESTAMP(gone_order_list.create_time))>600) and gone_order_list.create_time BETWEEN '2024-08-19' and '".$time_end."' and gone_order_list.is_delete = 1 and gone_order_list.company_id = '".$session['company_id']."' and time(gone_order_list.create_time)>='08:30:00' and time(gone_order_list.create_time)<='18:00:00'".$where)->count();//超十分钟未接单数量
+                $sql = "SELECT CAST((SUM(UNIX_TIMESTAMP(gone_order_list.feeds_time))-SUM(UNIX_TIMESTAMP(gone_order_list.get_time)))/COUNT(gone_order_list.id) as SIGNED) as timenum FROM gone_order_list LEFT JOIN `gone_orders` ON gone_order_list.`order_num` = gone_orders.`order_num` WHERE gone_order_list.ser_id='".$v['id']."' and gone_order_list.get_time != '' and gone_order_list.get_time!='0000-00-00 00:00:00' and gone_order_list.feeds_time != '' and gone_order_list.feeds_time!='0000-00-00 00:00:00' and gone_order_list.create_time BETWEEN '".$time_start."' and '".$time_end."' and gone_order_list.is_delete=1 and gone_order_list.company_id = '".$session['company_id']."'".$where;
                 $data = DB::select($sql);
-                $sql1 = "SELECT CAST((SUM(UNIX_TIMESTAMP(get_time))-SUM(UNIX_TIMESTAMP(create_time)))/COUNT(id) as SIGNED) as pdnum FROM gone_order_list WHERE ser_id='".$v['id']."' and get_time != '' and get_time!='0000-00-00 00:00:00' and create_time BETWEEN '".$time_start."' and '".$time_end."' and time(create_time)>='08:30:00' and time(create_time)<='18:00:00' and is_delete=1 and company_id = '".$session['company_id']."'";
+                $sql1 = "SELECT CAST((SUM(UNIX_TIMESTAMP(gone_order_list.get_time))-SUM(UNIX_TIMESTAMP(gone_order_list.create_time)))/COUNT(gone_order_list.id) as SIGNED) as pdnum FROM gone_order_list LEFT JOIN `gone_orders` ON gone_order_list.`order_num` = gone_orders.`order_num` WHERE gone_order_list.ser_id='".$v['id']."' and gone_order_list.get_time != '' and gone_order_list.get_time!='0000-00-00 00:00:00' and gone_order_list.create_time BETWEEN '".$time_start."' and '".$time_end."' and time(gone_order_list.create_time)>='08:30:00' and time(gone_order_list.create_time)<='18:00:00' and gone_order_list.is_delete=1 and gone_order_list.company_id = '".$session['company_id']."'".$where;
                 $data1 = DB::select($sql1);
-                $sqls = "SELECT CAST((SUM(UNIX_TIMESTAMP(feeds_time))-SUM(UNIX_TIMESTAMP(get_time)))/COUNT(id) as SIGNED) as timenum FROM gone_order_list WHERE ser_id='".$v['id']."' and create_time BETWEEN '2024-08-19' and '".$time_end."' and get_time != '' and get_time!='0000-00-00 00:00:00' and feeds_time != '' and feeds_time!='0000-00-00 00:00:00' and is_delete=1 and company_id = '".$session['company_id']."'";// and is_delete=1
+                $sqls = "SELECT CAST((SUM(UNIX_TIMESTAMP(gone_order_list.feeds_time))-SUM(UNIX_TIMESTAMP(gone_order_list.get_time)))/COUNT(gone_order_list.id) as SIGNED) as timenum FROM gone_order_list LEFT JOIN `gone_orders` ON gone_order_list.`order_num` = gone_orders.`order_num` WHERE gone_order_list.ser_id='".$v['id']."' and gone_order_list.create_time BETWEEN '2024-08-19' and '".$time_end."' and gone_order_list.get_time != '' and gone_order_list.get_time!='0000-00-00 00:00:00' and gone_order_list.feeds_time != '' and gone_order_list.feeds_time!='0000-00-00 00:00:00' and gone_order_list.is_delete=1 and gone_order_list.company_id = '".$session['company_id']."'".$where;// and is_delete=1
                 $datas = DB::select($sqls);
-                $sqls1 = "SELECT CAST((SUM(UNIX_TIMESTAMP(get_time))-SUM(UNIX_TIMESTAMP(create_time)))/COUNT(id) as SIGNED) as pdnum FROM gone_order_list WHERE ser_id='".$v['id']."' and create_time BETWEEN '2024-08-19' and '".$time_end."' and get_time != '' and get_time!='0000-00-00 00:00:00' and time(create_time)>='08:30:00' and time(create_time)<='18:00:00' and is_delete=1 and company_id = '".$session['company_id']."'";// and is_delete=1
+                $sqls1 = "SELECT CAST((SUM(UNIX_TIMESTAMP(gone_order_list.get_time))-SUM(UNIX_TIMESTAMP(gone_order_list.create_time)))/COUNT(gone_order_list.id) as SIGNED) as pdnum FROM gone_order_list LEFT JOIN `gone_orders` ON gone_order_list.`order_num` = gone_orders.`order_num` WHERE gone_order_list.ser_id='".$v['id']."' and gone_order_list.create_time BETWEEN '2024-08-19' and '".$time_end."' and gone_order_list.get_time != '' and gone_order_list.get_time!='0000-00-00 00:00:00' and time(gone_order_list.create_time)>='08:30:00' and time(gone_order_list.create_time)<='18:00:00' and gone_order_list.is_delete=1 and gone_order_list.company_id = '".$session['company_id']."'".$where;// and is_delete=1
                 $datas1 = DB::select($sqls1);
                 $return[$k]['id'] = $v['id'];//门店id
                 $return[$k]['company_name'] = $v['company_name'];//门店名称
@@ -161,10 +166,14 @@ class DataStatisticsService extends Service{
         if ($is_excel == 2) {
             DB::connection()->enableQueryLog();#开启执行日志
         }
-        $paginate = OrderList::where('is_delete',1)
-            ->whereBetween('create_time',[$time_start,$time_end])
-            ->where('company_id',$session['company_id'])
-            ->selectRaw("(UNIX_TIMESTAMP(feeds_time)-UNIX_TIMESTAMP(get_time)) AS sgtime,(UNIX_TIMESTAMP(get_time)-UNIX_TIMESTAMP(create_time)) AS jdtime,stauas,order_num,ser_id,create_time,get_time,feeds_time")
+        if(isset($input['goods_brand']) && !empty($input['goods_brand'])){
+            $where = " and gone_orders.goods_brand='".$input['goods_brand']."'";
+        }
+        $paginate = OrderList::leftjoin('orders', 'orders.order_num', '=', 'order_list.order_num')
+            ->leftjoin('order_msg', 'order_msg.id', '=', 'order_list.order_goods_id')
+            ->whereBetween('order_list.create_time',[$time_start,$time_end])
+            ->whereRaw("gone_order_list.company_id='".$session['company_id']."' and gone_order_list.is_delete=1".$where)
+            ->selectRaw("(UNIX_TIMESTAMP(gone_order_list.feeds_time)-UNIX_TIMESTAMP(gone_order_list.get_time)) AS sgtime,(UNIX_TIMESTAMP(gone_order_list.get_time)-UNIX_TIMESTAMP(gone_order_list.create_time)) AS jdtime,stauas,gone_order_list.order_num,gone_order_list.ser_id,gone_order_list.create_time,gone_order_list.get_time,gone_order_list.feeds_time,gone_order_msg.goods_name")
             ->orderBy('create_time','ASC')
             ->paginate($page_size);
         if ($is_excel == 2) {
@@ -177,6 +186,7 @@ class DataStatisticsService extends Service{
         foreach($datas as $k => $v){
             $return[$k]['company_name'] = $admindata[$v['ser_id']];//公司名称
             $return[$k]['order_num'] = $v['order_num'];//订单单号
+            $return[$k]['goods_name'] = $v['goods_name'];//商品名称
             $return[$k]['stauas'] = $statusName[$v['stauas']];//订单状态
             $return[$k]['create_time'] = $v['create_time'];//派单时间
             $return[$k]['get_time'] = $v['get_time'];//接单时间

app/Services/JdBoundService.php

@@ -2,6 +2,7 @@
 
 namespace App\Services;
 use App\Models\JdBound;
+use App\Models\JdBoundLead;
 use App\Models\Orders;
 use App\Models\User;
 use BlueCity\Core\Service\Service;
@@ -47,7 +48,7 @@ class JdBoundService extends Service
    * @return
    * @author du 2021年8月19日上午10:27:02
    */
-    public static function createjdBound($sku_id,$jd_goodn,$pt_id,$goods_id,$is_long,$goods_number,$goods_name,$company_id){
+    public static function createjdBound($sku_id,$jd_goodn,$pt_id,$goods_id,$is_long,$goods_number,$goods_name,$company_id,$creactor=''){
 		$poss['sku_id'] = $sku_id;
 		$poss['jd_goodn'] = $jd_goodn;
 		$poss['pt_id'] = $pt_id;
@@ -56,6 +57,7 @@ class JdBoundService extends Service
 		$poss['goods_number'] = $goods_number;
 		$poss['goods_name'] = $goods_name;
         $poss['company_id'] = $company_id;
+        $poss['creactor'] = $creactor;
 		$res = Db::table('jd_bound')->insert($poss);
     	return $res;
     }
@@ -70,11 +72,23 @@ class JdBoundService extends Service
      */
     public static function getList($input,$session){
     	$where = [];
-    	$Db = JdBound::leftjoin('pj_goods','pj_goods.pg_id','=','jd_bound.goods_id')->join('pt','jd_bound.pt_id','=','pt.id');
+        $state = $input['status'];
+        if($state == 3) {
+            $Db = JdBound::leftjoin('pj_goods', 'pj_goods.pg_id', '=', 'jd_bound.goods_id')->join('pt', 'jd_bound.pt_id', '=', 'pt.id');
+        }else{
+            $Db = JdBoundLead::leftjoin('pj_goods', 'pj_goods.pg_id', '=', 'jd_bound_lead.goods_id')->join('pt', 'jd_bound_lead.pt_id', '=', 'pt.id');
+        }
 
     	$where['1'] = 1;
+        if(in_array($state, [1,2,4])){
+            $where['is_state'] = $state;
+        }
         if ($session['admin_groupnew'] != 7) {//管理员可以看全部
+            if($state == 3) {
                 $where['gone_jd_bound.company_id'] = $session['company_id'];
+            }else{
+                $where['gone_jd_bound_lead.company_id'] = $session['company_id'];
+            }
         }
         if(isset($input['sku_id'])){
             $where['sku_id_like'] = $input['sku_id'];
@@ -99,11 +113,27 @@ class JdBoundService extends Service
     	$where = CommonService::jointWhere($where);
     	$page_size = $input['page_size']??10;
     	//DB::connection()->enableQueryLog();#开启执行日志
-    	$paginate = $Db->whereRaw($where)->select("jd_bound.id AS id","sku_id","jd_goodn","is_long","brand_name","pg_series","version","general_version","national_version","pt.pt_name AS pt_name")->orderBy('jd_bound.id','asc')->paginate($page_size);
+        if($state == 3) {
+            $paginate = $Db->whereRaw($where)->select("jd_bound.id AS id", "sku_id", "jd_goodn", "is_long", "brand_name", "pg_series", "version", "general_version", "national_version", "pt.pt_name AS pt_name",'creactor')->orderBy('jd_bound.id', 'asc')->paginate($page_size);
+        }else{
+            $paginate = $Db->whereRaw($where)->select("jd_bound_lead.id AS id", "sku_id", "jd_goodn", "is_long", "brand_name", "pg_series", "version", "general_version", "national_version", "pt.pt_name AS pt_name",'is_state','state_explain','jd_bound_lead.creact_time','jd_bound_lead.update_time','jd_bound_lead.creactor')->orderBy('jd_bound_lead.id', 'asc')->paginate($page_size);
+        }
     	//print_r(DB::getQueryLog());
-
+        $wcl = JdBoundLead::where("is_state",1)->count();
+        $tbsb = JdBoundLead::where("is_state",2)->count();
+        $data['showcount'] = [
+            ['showname' => "未处理", 'shownum' => $wcl,'status'=>1],
+            ['showname' => "同步失败", 'shownum' => $tbsb,'status'=>2],
+            ['showname' => "已绑定", 'shownum' => '--','status'=>3],
+            ['showname' => "已忽略", 'shownum' => '--','status'=>4]
+        ];
     	$all_button = BmmcService::whereButton($input['token'],$input['Pri_id']);
-    	$export = BmmcService::getTopButton('addBound','',$all_button);
+    	if($state==1){
+    	    $topdata = 'addBound,sysBound,uploadExcelImport';
+        }else{
+            $topdata = 'addBound';//uploadExcelImport
+        }
+    	$export = BmmcService::getTopButton($topdata,'',$all_button);
     	$data['button_top'] = $export['button_top']??[];//顶部按钮
     	$data['button_search'] = $export['button_search']??[];//搜索栏按钮
     	$list = CommonService::dataToArray($paginate->items());
@@ -131,13 +161,33 @@ class JdBoundService extends Service
     public static function getButtonDatas($all_button,$list){
 
     	foreach ($list as $k => $v){
+    	    $is_state = $v['is_state']??3;
             $buttonData = [];
+    	    switch ( $is_state ){
+    	        case 1:
+                    $list[$k]['stateName'] = '未绑定';
+                    $buttonData[] = 'sysLeadBound';
+    	            break;
+                case 2:
+                    $list[$k]['stateName'] = $v['state_explain'];
+                    $buttonData[] = 'editLeadBound,deleteLeadBound';
+                    break;
+                case 3:
+                    $buttonData[] = 'editBound,deleteBound';
+                    $list[$k]['stateName'] = '已绑定';
+                    break;
+                case 4:
+                    $list[$k]['stateName'] = '已忽略';
+                    break;
+    	        default:
+                    $list[$k]['stateName'] = '未设定';
+    	            break;
+    	    }
             if($v['pg_series']==''){
                 $list[$k]['sd_name'] = $v['brand_name']."-".$v['version'];
             }else{
                 $list[$k]['sd_name'] = $v['brand_name']."-".$v['pg_series']."-".$v['version'];
             }
-    		$buttonData[] = 'editBound,deleteBound';
     		$button = BmmcService::getListButton($buttonData,$all_button);
 
     		$list[$k]['button_one'] = $button['button_one']??[];

app/Services/OrderService.php

@@ -3030,6 +3030,7 @@ class OrderService extends Service
                                         $session['id'] = '1133';
                                         $session['admin_acc'] = '系统操作';
                                         $session['admin_groupnew'] = 7;
+                                        $session['company_id'] = Pt::where('id',$pt_id)->value('company_id');
                                         $rea = OrderService::lockOrder($refund, $session, '39.105.188.64');
                                     } else {
                                         $rea = '无订单商品';

app/Services/SubmitPleaseService.php

@@ -171,6 +171,7 @@ class SubmitPleaseService extends Service
 
         $where[1] = 1;
         $where = CommonService::jointWhere($where);
+        $data['where'] = $where;
         $page_size = $input['page_size']??10;
 
         if($input['is_excel']==1){

routes/api.php

@@ -110,6 +110,8 @@ Route::group(['prefix' => 'service', 'middleware' => 'requestpc', 'namespace' =>
     Route::post('supplierPrice/edit', 'SupplierPriceController@edit'); //服务供货价修改界面参数
     Route::post('supplierPrice/update', 'SupplierPriceController@update'); //服务供货价更新数据
     Route::post('supplierPrice/delete', 'SupplierPriceController@destroy'); //服务供货价删除
+    Route::post('supplierPrice/uploadExcelImport', 'SupplierPriceController@uploadExcelImport'); //导入供货价
+    Route::post('supplierPrice/sysLeadData', 'SupplierPriceController@sysLeadData'); //同步导入价格
 
    //du 2022-4-19
     Route::post('supplierXPrice/index', 'SupplierXPriceController@index'); //分销供货价管理
@@ -791,6 +793,9 @@ Route::group(
         Route::post('addBound','JdBoundController@addBound');        //添加
         Route::post('editBound','JdBoundController@editBound');        //编辑
         Route::post('deleteBound','JdBoundController@deleteBound');//删除-
+        Route::post('uploadExcelImport','JdBoundController@uploadExcelImport');//导入
+        Route::post('sysLeadBound','JdBoundController@sysLeadBound');//同步绑定
+        Route::post('deleteLeadBound','JdBoundController@deleteLeadBound');//忽略数据
 
     });
     //非京东商品绑定
@@ -843,6 +848,7 @@ Route::group(
             Route::post('AddEntry', 'BservissController@AddEntry');//添加-
             Route::post('searchService', 'BservissController@searchService');
             Route::post('region', 'BservissController@region');
+            Route::post('search_sheng', 'BservissController@search_sheng');
 
         });