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

app/admin/controller/Consult.php

@@ -730,10 +730,12 @@ class Consult extends Base
         }else{
 
             if($nake_fee){
-                $saleprice = $open_fee / $zxinfo['num'] + $cost_fee * $weight + $pakge_fee + $mark_fee + $cert_fee + $nake_fee / (1 - $budget);
+                $saleprice = ($open_fee / $zxinfo['num'] + $cost_fee * $weight + $pakge_fee + $mark_fee + $cert_fee +
+                    $nake_fee)/ (1 - $budget);
                 $total_fee = $open_fee / $zxinfo['num'] + $cost_fee * $weight + $pakge_fee + $mark_fee + $cert_fee + $nake_fee;
             }else{
-                $saleprice = $open_fee / $zxinfo['num'] + $cost_fee * $weight + $pakge_fee + $mark_fee + $cert_fee / (1 - $budget);
+                $saleprice = ($open_fee / $zxinfo['num'] + $cost_fee * $weight + $pakge_fee + $mark_fee + $cert_fee) /
+                    (1 - $budget);
                 $total_fee = $open_fee / $zxinfo['num'] + $cost_fee * $weight + $pakge_fee + $mark_fee + $cert_fee;
             }
 
@@ -1406,16 +1408,16 @@ class Consult extends Base
         }else{
 
             if($bids['nake_fee']!=0){
-                $saleprice = $bids['open_fee'] / $coninfo['num']+$bids['cost_fee']*$bids['weight']+$bids['pakge_fee'] +$bids['mark_fee']+  $bids['cert_fee'] +  $bids['nake_fee']/ (1 - $budget);
-                $rate_price = $bids['open_fee'] / $coninfo['num']+$bids['cost_fee']*$bids['weight']+$bids['pakge_fee'] +$bids['mark_fee']+  $bids['cert_fee'] +  $bids['nake_fee']/ (1 - $rate);
-                $money_price =$bids['open_fee'] / $coninfo['num']+$bids['cost_fee']*$bids['weight']+$bids['pakge_fee'] +$bids['mark_fee']+  $bids['cert_fee'] +  $bids['nake_fee']/ (1 - $money_rate);
-                $lower_price = $bids['open_fee'] / $coninfo['num']+$bids['cost_fee']*$bids['weight']+$bids['pakge_fee'] +$bids['mark_fee']+  $bids['cert_fee'] +  $bids['nake_fee'] / (1 - $lower_rate);
+                $saleprice = ($bids['open_fee'] / $coninfo['num']+$bids['cost_fee']*$bids['weight']+$bids['pakge_fee'] +$bids['mark_fee']+  $bids['cert_fee'] +  $bids['nake_fee'])/ (1 - $budget);
+                $rate_price = ($bids['open_fee'] / $coninfo['num']+$bids['cost_fee']*$bids['weight']+$bids['pakge_fee'] +$bids['mark_fee']+  $bids['cert_fee'] +  $bids['nake_fee'])/ (1 - $rate);
+                $money_price =($bids['open_fee'] / $coninfo['num']+$bids['cost_fee']*$bids['weight']+$bids['pakge_fee'] +$bids['mark_fee']+  $bids['cert_fee'] +  $bids['nake_fee'])/ (1 - $money_rate);
+                $lower_price = ($bids['open_fee'] / $coninfo['num']+$bids['cost_fee']*$bids['weight']+$bids['pakge_fee'] +$bids['mark_fee']+  $bids['cert_fee'] +  $bids['nake_fee']) / (1 - $lower_rate);
 
             }else{
-                $saleprice =  $bids['open_fee'] / $coninfo['num']+$bids['cost_fee']*$bids['weight']+$bids['pakge_fee'] +$bids['mark_fee']+  $bids['cert_fee'] / (1 - $budget);
-                $rate_price =$bids['open_fee'] / $coninfo['num']+$bids['cost_fee']*$bids['weight']+$bids['pakge_fee'] +$bids['mark_fee']+  $bids['cert_fee']/ (1 - $rate);
-                $money_price = $bids['open_fee'] / $coninfo['num']+$bids['cost_fee']*$bids['weight']+$bids['pakge_fee'] +$bids['mark_fee']+  $bids['cert_fee'] / (1 - $money_rate);
-                $lower_price = $bids['open_fee'] / $coninfo['num']+$bids['cost_fee']*$bids['weight']+$bids['pakge_fee'] +$bids['mark_fee']+  $bids['cert_fee'] / (1 - $lower_rate);
+                $saleprice = ($bids['open_fee']/$coninfo['num']+$bids['cost_fee']*$bids['weight']+$bids['pakge_fee'] +$bids['mark_fee']+  $bids['cert_fee']) / (1 - $budget);
+                $rate_price =($bids['open_fee'] /$coninfo['num']+$bids['cost_fee']*$bids['weight']+$bids['pakge_fee'] +$bids['mark_fee']+  $bids['cert_fee'])/ (1 - $rate);
+                $money_price =($bids['open_fee'] / $coninfo['num']+$bids['cost_fee']*$bids['weight']+$bids['pakge_fee'] +$bids['mark_fee']+  $bids['cert_fee']) / (1 - $money_rate);
+                $lower_price = ($bids['open_fee'] / $coninfo['num']+$bids['cost_fee']*$bids['weight']+$bids['pakge_fee'] +$bids['mark_fee']+  $bids['cert_fee'])/ (1 - $lower_rate);
 
             }
 
@@ -1441,6 +1443,7 @@ class Consult extends Base
             if($info['status']==7){
                 if($info['after_price']<$lower_price){
                     $info['status']=10;
+
                 }else{
                     $info['status']=9;
                 }
@@ -1545,6 +1548,7 @@ class Consult extends Base
         $info['unit'] = isset($unit['unit'])?$unit['unit']:'';
         $bidinfoe = Db::name("consult_info")->where(["infoNo"=>$info["infoNo"]])->find();
         $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']:0;
+        $lower_rate = isset($catinfo['lower_rate']) ? $catinfo['lower_rate']/100:0;//boss主管利率
         $info['budget'] =$budget;
         $god=[
             "metal_id"=>$bidinfos['metal_id'],
@@ -1564,6 +1568,15 @@ class Consult extends Base
                 $gold = Db::name("gold_price1")->where(["type"=>$bidinfos["metal_id"],"is_del"=>0,"status"=>1])->order("addtime desc")
                     ->find();
                 $info['gold_price'] =$gold['price'];
+                $lower_price = ($bidinfos['open_fee'] / $consultinfos['num'] + $bidinfos['weight']* $gold["price"] +$bidinfos['cost_fee']*$bidinfos['weight'] + $bidinfos['pakge_fee'] +$bidinfos['mark_fee'] + $bidinfos['cert_fee'] + $bidinfos['nake_fee']) / (1 - $lower_rate);
+
+            }else{
+                if($bidinfos['nake_fee']!=0){
+                          $lower_price =($bidinfos['open_fee']/$consultinfos['num']+$bidinfos['cost_fee']*$bidinfos['weight']+$bidinfos['pakge_fee'] +$bidinfos['mark_fee']+  $bidinfos['cert_fee'] +  $bidinfos['nake_fee']) / (1 - $lower_rate);
+
+                }else{
+                       $lower_price = ($bidinfos['open_fee']/$consultinfos['num']+$bidinfos['cost_fee']*$bidinfos['weight']+$bidinfos['pakge_fee'] +$bidinfos['mark_fee']+  $bidinfos['cert_fee'])/ (1 - $lower_rate);
+                }
             }
         $info['cost_desc'] =$bidinfos['cost_desc'];
         $info['work_day'] =$bidinfos['work_day'];
@@ -1609,7 +1622,11 @@ class Consult extends Base
         $info['metal_name']=isset($bidinfos['metal_id'])&& $bidinfos['metal_id']!=0?$this->noble[$bidinfos['metal_id']]:"";
         $info['sale_price'] =round($bidinfos['sale_price'],2);
         $info['specinfo'] = isset($bidinfos['specinfo'])&&$bidinfos['specinfo']!=""?json_decode($bidinfos['specinfo'],true):[];
-
+        if($info['status']==7){
+            $info['lower_price'] =$lower_price;
+        }else{
+            $info['lower_price'] =0;
+        }
         //获取议价原因
         if ($info['result_info_id'] != 0) {
             $info['result_info'] = Db::name('result_info')->where(['result_code' => $info['result_info_id'], 'type' => 7, 'status' => 1, 'is_del' => 0])->value('result');