edit

app/ExcelTemp/ExcelTemp.php

@@ -307,7 +307,7 @@ trait ExcelTemp
                 ['field_name' => '区县', 'field_value' => 'shr_xian'],
                 ['field_name' => '详细地址', 'field_value' => 'shr_adress'],
                 ['field_name' => '接单技师', 'field_value' => 'intall_person'],
-                //省份 、城市、 区县 、 详细地址、 接单技师    
+                //省份 、城市、 区县 、 详细地址、 接单技师
                 //'时间','型号','派工单号','金额','服务商名称','手机号','数据id','姓名','金额详情
 // ['field_name' => '姓名', 'field_value' => 'shr_name'],['field_name' => '订单金额 ', 'field_value' => 'all_price'],
             ],
@@ -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/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/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/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) {//管理员可以看全部
-            $where['gone_jd_bound.company_id'] = $session['company_id'];
+            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');
 
         });