Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/admin/controller/Consult.php

@@ -185,6 +185,8 @@ class Consult extends Base
         	$payinfo =Db::name("pay")->where("id",$pay_id)->findOrEmpty();
         	if(empty($payinfo)) return error_show(1004, "支付渠道信息未找到");
         	if($payinfo['status']!=1)return error_show(1004, "支付渠道已禁用");
+        	$supplierArr =Db::name("pay_rate")->where(["pay_id"=>$pay_id,"status"=>1,"is_del"=>0])->column("companyNo");
+        	if(in_array($companyNo,$supplierArr)) return error_show(1004, "支付渠道含有该业务公司，支付渠道无法使用！");
         }
         $user =GetUserInfo($token);
         if(empty($user)||$user['code']!=0){

app/admin/controller/Project.php

@@ -62,6 +62,8 @@ class Project extends Base
         	$payinfo =Db::name("pay")->where("id",$pay_id)->findOrEmpty();
         	if(empty($payinfo)) return error_show(1004, "支付渠道信息未找到");
         	if($payinfo['status']!=1)return error_show(1004, "支付渠道已禁用");
+        	$supplierArr =Db::name("pay_rate")->where(["pay_id"=>$pay_id,"status"=>1,"is_del"=>0])->column("companyNo");
+        	if(in_array($companyNo,$supplierArr)) return error_show(1004, "支付渠道含有该业务公司，支付渠道无法使用！");
         }
         $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
         if($token==''){

app/admin/controller/Sale.php

@@ -55,6 +55,8 @@ class Sale extends Base
         	$payinfo =Db::name("pay")->where("id",$pay_id)->findOrEmpty();
         	if(empty($payinfo)) return error_show(1004, "支付渠道信息未找到");
         	if($payinfo['status']!=1)return error_show(1004, "支付渠道已禁用");
+        	$supplierArr =Db::name("pay_rate")->where(["pay_id"=>$pay_id,"status"=>1,"is_del"=>0])->column("companyNo");
+        	if(in_array($supplierNo,$supplierArr)) return error_show(1004, "支付渠道含有该业务公司，支付渠道无法使用！");
         }
         $sendtype = isset($this->post['sendtype']) && $this->post['sendtype'] !== "" ? intval($this->post['sendtype']) : "";
         if ($sendtype === '') {