Explorar el Código

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

wufeng hace 2 años
padre
commit
2c58eda699
Se han modificado 1 ficheros con 9 adiciones y 4 borrados
  1. 9 4
      app/admin/controller/Consult.php

+ 9 - 4
app/admin/controller/Consult.php

@@ -725,10 +725,15 @@ class Consult extends Base
             $sale_cost_fee = (($open_fee / $zxinfo['num'] + $weight * $gold["price"] + $cost_fee * $weight + $pakge_fee + $mark_fee + $cert_fee + $nake_fee) / (1 - $budget) - ($demo_fee / $zxinfo['num'] + $open_fee / $zxinfo['num'] + $pakge_fee + $mark_fee + $cert_fee + $nake_fee + $delivery_fee)) / $weight - $gold["price"];
 
         }else{
-            $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;
+
+            if($nake_fee){
+                $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);
+                $total_fee = $open_fee / $zxinfo['num'] + $cost_fee * $weight + $pakge_fee + $mark_fee + $cert_fee;
+            }
+
         }