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

app/admin/controller/Consult.php

@@ -1571,14 +1571,16 @@ 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);
+                $lower_price = ($bidinfos['demo_fee']/$consultinfos['num']+$bidinfos['delivery_fee']+$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);
+                          $lower_price =($bidinfos['demo_fee']/$consultinfos['num']+$bidinfos['delivery_fee']+$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);
+                       $lower_price = ($bidinfos['demo_fee']/$consultinfos['num']+$bidinfos['delivery_fee']+$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'];

app/common.php

@@ -745,8 +745,8 @@ function GoldPrice($data,$cost_rate=0){
         ->find();
 //    $rate = $data['open_fee']/$data['num'] + $data['weight']* $gold["price"] + $data['cost_fee']/(1-$cost_rate) *
 //        $data['weight']+$data['packing_fee']+$data["mark_fee"]+$data["cert_fee"]+$data['nake_fee'];
-    $saleprice = ($data['open_fee']/$data['num']+ $data['weight']* $gold["price"] + $data['cost_fee'] *$data['weight'] + $data['packing_fee']
-            + $data["mark_fee"]+ $data["cert_fee"]+$data['nake_fee']) / (1 - $cost_rate);
+    $saleprice = ($data['demo_fee']/$data['num']+$data['delivery_fee']+$data['open_fee']/$data['num']+ $data['weight']*
+            $gold["price"] + $data['cost_fee'] *$data['weight'] + $data['packing_fee']+ $data["mark_fee"]+ $data["cert_fee"]+$data['nake_fee']) / (1 - $cost_rate);
 
     return $saleprice;
 }