a

app/admin/controller/CatPlat.php

@@ -276,7 +276,7 @@ use think\App;class CatPlat extends Base{
 
         //计算毛利率
         $budget = get_budget($good['cat_id'], $companyNo, $platid);
-
+		if($budget===false) $this->error('未找到业务公司有关的平台分类毛利信息');
 //        $budget = isset($catinfo['sale_rate']) ? $catinfo['sale_rate']/100:0;
         $top_cat_id = made($good['cat_id']);//获取所有分类
         $top_cat_id = isset($top_cat_id[0]['id']) ? $top_cat_id[0]['id'] : 0;//获取顶级分类id

app/admin/controller/Consult.php

@@ -346,7 +346,7 @@ class Consult extends Base
             return error_show(1004,"未找到咨询信息数据");
         }
         $budget = get_budget($zxinfo['cat_id'], $zxorder['companyNo'], $zxorder['platform_code']);
-
+		if($budget===false) $this->error("未找到业务公司有关的平台分类毛利信息");
         $zxinfo['can']= isset($zxinfo['cat_id']) && $zxinfo['cat_id'] !=0 ? made($zxinfo['cat_id'],[]):[];
         $zxinfo['khname']="";
         $zxinfo['original_price']=sprintf("%.2f",$zxinfo['budget_price']* (1 -$budget));
@@ -773,6 +773,7 @@ class Consult extends Base
 		
         //计算毛利率
         $budget = get_budget($zxinfo['cat_id'], $zx['companyNo'], $zx['platform_code']);
+		if($budget===false) $this->error('未找到业务公司有关的平台分类毛利信息');
         //部分参数的大小校验
         $vali = Validate::rule([
             'expire_day|有效时长'=>'require|elt:214748364',
@@ -1027,6 +1028,7 @@ class Consult extends Base
         $bidinfo = Db::name("consult_info")->where(["infoNo"=>$info["infoNo"]])->find();
 //        $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']:0;
         $budget = get_budget($info['cat_id'], $zx['companyNo'], $zx['platform_code']);
+        if($budget===false) $this->error('未找到业务公司有关的平台分类毛利信息');
         $god=[
             "metal_id"=>$info['metal_id'],
             "weight"=>$info["good_weight"],
@@ -1172,7 +1174,7 @@ class Consult extends Base
             return error_show(1002,"参数delivery_place不能为空");
         }
 	    $budget = get_budget($cat_id,$zx['companyNo'],$zx['platform_code']);
-
+		if($budget===false) $this->error('未找到业务公司有关的平台分类毛利信息');
         $sale_cost_fee = $bidinfo['sale_cost_fee'];
 
         $cat_top_list = made($cat_id);
@@ -1613,7 +1615,7 @@ class Consult extends Base
             ->findOrEmpty();
 
         $catinfo = get_budget($bids['cat_id'],$tmp['companyNo']??'',$tmp['platform_code']??0,true);
-
+			if($catinfo===false) $this->error('未找到业务公司有关的平台分类毛利信息');
         $rate = isset($catinfo['rate']) ? $catinfo['rate']/100:0; //业务主管利率
         if($bids['is_gold_price']==1){
             $gold = Db::name("gold_price1")->where(["type"=>$bids['metal_id'],"is_del"=>0,"status"=>1])->order("addtime desc")
@@ -1743,7 +1745,7 @@ class Consult extends Base
             ->findOrEmpty();
 
         $catinfo = get_budget($bidinfos['cat_id'],$tmp['companyNo']??'',$tmp['platform_code']??0,true);
-
+		if($catinfo===false) $this->error('未找到业务公司有关的平台分类毛利信息');
         $info['can']= isset($bidinfos['cat_id']) && $bidinfos['cat_id'] !=0 ? made($bidinfos['cat_id']):[];
         $unit =Db::name("unit")->where(["id"=>$bidinfos['unit_id']])->find();
         $info['unit'] = isset($unit['unit'])?$unit['unit']:'';
@@ -1920,6 +1922,7 @@ class Consult extends Base
             $bidinfo = Db::name("consult_info")->where(["infoNo"=>$value["infoNo"]])->find();
             $zx = Db::name("consult_order")->where(["zxNo"=>$value["zxNo"]])->find();
              $budget = get_budget($value['cat_id'],$zx['companyNo']??'',$zx['platform_code']??0);
+//             if($budget===false) $this->error('未找到业务公司有关的平台分类毛利信息');
 //            $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']:0;
                 $god=[
                     "metal_id"=>$value['metal_id'],
@@ -2042,6 +2045,7 @@ class Consult extends Base
 //            $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']:0;
               $zx = Db::name("consult_order")->where(["zxNo"=>$value["zxNo"]])->find();
              $budget = get_budget($value['cat_id'],$zx['companyNo']??'',$zx['platform_code']??0);
+             if($budget===false) $this->error('未找到业务公司有关的平台分类毛利信息');
             $god=[
                 "metal_id"=>$value['metal_id'],
                 "weight"=>$value["good_weight"],
@@ -2219,6 +2223,7 @@ class Consult extends Base
 //            $budget = $cat[$bidinfos['cat_id']] ?? 0;//isset($catinfo['order_rate']) ? $catinfo['order_rate']:0;
 
             $budget = get_budget($bidinfos['cat_id'],$value['companyNo']??'',$value['platform_code']??0);
+            if($budget===false) $this->error('未找到业务公司有关的平台分类毛利信息');
             $value['budget'] = $budget;
             $god = [
                 "metal_id" => $bidinfos['metal_id'],
@@ -2478,6 +2483,7 @@ class Consult extends Base
             $bidinfo = Db::name("consult_info")->where(["infoNo" => $value["infoNo"]])->find();
 //            $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate'] : 0;
             $budget = get_budget((int)$value['cat_id'], $value['companyNo'], (int)$value['platform_code']);
+//           if($budget===false) $this->error('未找到业务公司有关的平台分类毛利信息');
             $god = [
                 "metal_id" => $value['metal_id'],
                 "weight" => $value["good_weight"],

app/admin/controller/Goodup.php

@@ -2681,7 +2681,7 @@ class Goodup extends Base
 
         //计算毛利率
         $budget = get_budget($good['cat_id'],$param['relaComNo'],$param['platform_id']);
-
+		if($budget===false) $this->error('未找到业务公司有关的平台分类毛利信息');
         $top_cat_id = made($good['cat_id']);//获取所有分类
         $top_cat_id = isset($top_cat_id[0]['id']) ? $top_cat_id[0]['id'] : 0;//获取顶级分类id
 

app/common.php

@@ -1635,7 +1635,7 @@ if (function_exists('get_budget') == false) {
 
         if ($is_show_more) {
 	        $sale_rate_1 = (new \app\admin\model\CompanyCatProfit)->GetAllRate($relaComNo,$cat_id);
-			if($sale_rate_1->isEmpty()) throw new \think\Exception('该分类未找到有关毛利信息');
+			if($sale_rate_1->isEmpty()) return false;
 			 $sale_rate_2 = (new \app\admin\model\CompanyPlatformCatProfit)->GetAllRate($relaComNo,$cat_id,$platform_id);
             //返回多个字段的和
             return [
@@ -1648,7 +1648,7 @@ if (function_exists('get_budget') == false) {
             ];
         } else {
         	 $sale_rate_1 = (new \app\admin\model\CompanyCatProfit)->GetRate($relaComNo,$cat_id,"sale_rate");
-			if($sale_rate_1==0) throw new \think\Exception('该分类未找到有关毛利信息');
+			if($sale_rate_1==0) return false;
 			 $sale_rate_2 = (new \app\admin\model\CompanyPlatformCatProfit)->GetRate($relaComNo,$cat_id,$platform_id,'sale_rate');
         	return ($sale_rate_1 + $sale_rate_2) / 100;
         } //此时的毛利率要取两个毛利的和