소스 검색

Merge branch 'dev_wf' of wugg/phpstock into version1.5

wufeng 2 년 전
부모
커밋
40278339c4
1개의 변경된 파일8개의 추가작업 그리고 2개의 파일을 삭제
  1. 8 2
      app/admin/controller/Goodup.php

+ 8 - 2
app/admin/controller/Goodup.php

@@ -437,6 +437,8 @@ class Goodup extends Base
                 }
                 $catinfo = Db::name("cat")->where(["id"=>$cat_id])->find();
                 $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']/100:0;
+                $top_cat_id = made($cat_id);//获取所有分类
+                $top_cat_id = isset($top_cat_id[0]['id']) ? $top_cat_id[0]['id'] : 0;//获取顶级分类id
                 if($good_ladder!=="" && !empty($good_ladder)){
                     $temp=[];
                     foreach ($good_ladder as $value){
@@ -450,7 +452,7 @@ class Goodup extends Base
                         $lemp['mark_fee'] = $value['mark_fee'];
                         $lemp['package_fee'] = $value['package_fee'];
                         $lemp['other_fee'] = $value['other_fee'];
-                        if($is_gold_price==1 && $cat_id==6){
+                        if($is_gold_price==1 && $top_cat_id==6){
 
                             //$is_gold_price==1 表示启用实时金价,cat_id==6表示贵金属
                             //$gold = Db::name("gold_price1")->where(["type" => $noble_metal, "status" => 1, "is_del" => 0])->order("addtime desc")->find();
@@ -1711,6 +1713,9 @@ class Goodup extends Base
 
                     $user =GetUserInfo($this->post['token']);//获取用户信息,下面更新成本表的创建人
 
+                    $top_cat_id = made($cat_id);//获取所有分类
+                    $top_cat_id = isset($top_cat_id[0]['id']) ? $top_cat_id[0]['id'] : 0;//获取顶级分类id
+
                     foreach ($good_ladder as $value){
                         $lemp=[];
                         isset($value["id"])&&$value["id"]!=''?$lemp['id']=$value['id']:"";
@@ -1723,7 +1728,8 @@ class Goodup extends Base
                         $lemp['mark_fee'] = $value['mark_fee'];
                         $lemp['package_fee'] = $value['package_fee'];
                         $lemp['other_fee'] = $value['other_fee'];
-                        if ($is_gold_price == 1 && $cat_id == 6) {
+
+                        if ($is_gold_price == 1 && $top_cat_id == 6) {
                             //$gold =Db::name("gold_price1")->where(["type"=>$noble_metal,"status"=>1,"is_del"=>0])->order("addtime desc")->find();
 
                             //$lemp['nake_total'] =$noble_weight*$gold['price'] + $value['cost_fee']*$noble_weight+$value['mark_fee']+$value['package_fee']+$value['cert_fee']+$value['nake_fee']+$value['delivery_fee']+$value['other_fee'];