ad

app/admin/controller/Consult.php

@@ -203,15 +203,8 @@ class Consult extends Base
             ->findOrEmpty();
         if (empty($platform)) return json_show(1004, '该平台不存在');
         if ($platform['status'] != 1) return json_show(1004, '该平台已禁用');
-        $pay_id = 0;
-        if ($platform['is_select_pay_rate'] == 1) {
-            $temp = Db::name('platform_pay_rate')
-                ->field('id')
-                ->where(['is_del' => 0, 'status' => 1, 'platform_id' => $platform_code, 'companyNo' => $companyNo])
-                ->findOrEmpty();
-            if (!empty($temp)) return json_show(1004, '支付渠道含有该业务公司，支付渠道无法使用！');
-            $pay_id = $platform_code;
-        }
+        $pay_id = $platform_code;
+         if ($platform['is_select_pay_rate'] == 1&& channel_is_company($platform_code,$companyNo))return error_show(1004, "平台渠道含有业务公司");
 
         $ladder = isset($this->post['ladder'])&&!empty($this->post['ladder']) ? $this->post['ladder']:"";
         if($ladder==""){
@@ -907,11 +900,8 @@ class Consult extends Base
                 ->where(['is_del' => 0, 'id' => $zx['platform_code']])
                 ->value('is_select_pay_rate', 0);
             if ($is_select_pay_rate == 1) {
-                $temp = Db::name('platform_pay_rate')
-                    ->field('id')
-                    ->where(['is_del' => 0, 'platform_id' => $zx['platform_code'], 'companyNo' => $supplierArr['relation_code']])
-                    ->findOrEmpty();
-                if (!empty($temp)) return json_show(1004, '招标任务平台已存在该供应商，请更换其他供应商');
+               if(channel_is_company($zx['platform_code'],$supplierArr['relation_code'])) return  error_show(1004, "平台渠道含有业务公司{$supplierNo}");
+//                if (!empty($temp)) return json_show(1004, '招标任务平台已存在该供应商，请更换其他供应商');
             }
         }
 

app/admin/controller/Good.php

@@ -108,6 +108,10 @@ class Good extends Base
         if($is_compliance!==""){
             $where[]=['b.is_compliance',"=",$is_compliance];
         }
+        $supplier = isset($this->post['supplier_name']) && $this->post['supplier_name'] !=="" ? trim($this->post['supplier_name']) :"";
+        if($supplier!==""){
+			$where[]=['a.supplierName',"like","%$supplier%"];
+        }
 //        $role=$this->checkRole();
 //        if(!empty($role['write']) ){
 //            $where[]=["a.createrid","in",$role['write']];
@@ -362,7 +366,7 @@ class Good extends Base
 
             //是否具有编辑权限
             $value['is_allow_update'] = 0;
-            if (in_array($this->roleid, [1, 33]) || in_array($value['createrid'], $role[DataGroupModel::$type_可编辑])) $value['is_allow_update'] = 1;
+//            if (in_array($this->roleid, [1, 33]) || in_array($value['createrid'], $role[DataGroupModel::$type_可编辑])) $value['is_allow_update'] = 1;
 
             //补充商品详情链接字段
             $value['detail_url'] = $detail_url_skuCode[$value['skuCode']]??'';

app/admin/controller/Goodup.php

@@ -1581,19 +1581,12 @@ class Goodup extends Base
             ->where(['is_del'=>0,'id'=>$platform])
             ->findOrEmpty();
         if(empty($platform_info)) return error_show(1005,'所选的平台不存在');
+        if($platform_info['status']!=1) return error_show(1005,'所选的平台已禁用');
 
         if($platform_info['is_select_pay_rate']==1){
-            //所选的商品成本中的业务公司，不能和支付渠道中的业务公司重复
-            $companyNo = Db::name('platform_pay_rate')
-                ->where(['platform_id'=>$platform,'is_del'=>0])
-                ->column('companyNo');
-            $tmp = Db::name("good_basic")
-                ->field('id,spuCode,good_name,companyNo,good_thumb_img')
-                ->where(["spuCode"=>$spuCode,"is_del"=>0])
-                ->whereIn('companyNo',$companyNo)
-                ->select()
-                ->toArray();
-            if(!empty($tmp)) return json_show(1009,'以下商品的业务公司和平台支付渠道中的业务公司重复，不允许上线',$tmp);
+			foreach ($datas as  $ite){
+				if(channel_is_company($platform,$ite['companyNo'])) return  error_show(1004, "商品{$ite['spuCode']}平台渠道含有业务公司{$ite['companyName']}");
+			}
         }
 
         if($platform_info['platform_type']==1) return \app\youzan\logic\Goodup::create([

app/admin/controller/Project.php

@@ -40,13 +40,8 @@ class Project extends Base
             ->findOrEmpty();
         if (empty($platform_temp)) return json_show(1004, '该平台不存在');
         if ($platform_temp['status'] != 1) return json_show(1004, '该平台已被启用');
-        if ($platform_temp['is_select_pay_rate'] == 1) {
-            $temp = Db::name('platform_pay_rate')
-                ->field('id')
-                ->where(['is_del' => 0, 'platform_id' => $platform, 'companyNo' => $companyNo])
-                ->findOrEmpty();
-            if (!empty($temp)) return json_show(1004, '平台设置支付渠道业务公司，不能包含销售方公司');
-        }
+        if ($platform_temp['is_select_pay_rate'] == 1&& channel_is_company($platform,$companyNo))return error_show(1004, "平台渠道含有业务公司");
+
 
         $use_desc = isset($this->post['use_desc'])&&$this->post['use_desc']!=""?trim($this->post['use_desc']):"";
         $budget_total = isset($this->post['budget_total'])&&$this->post['budget_total']!=""?floatval($this->post['budget_total']):"";