wugg 2 years ago
parent
commit
c37d0deced
2 changed files with 16 additions and 18 deletions
  1. 9 10
      app/admin/controller/Goodup.php
  2. 7 8
      app/admin/controller/Sale.php

+ 9 - 10
app/admin/controller/Goodup.php

@@ -221,6 +221,9 @@ class Goodup extends Base
         }
         $lead_time = isset($this->post['lead_time'])&&$this->post['lead_time']!==""? intval($this->post['lead_time'])
             :"0";
+        $cgd_gold_price =isset($ths->post['cgd_gold_price'])&&$ths->post['cgd_gold_price']!==""?floatval($ths->post['cgd_gold_price']):"0";
+
+
 //        if($lead_time===""){
 //            return error_show(1004,"参数lead_time不能为空");
 //        }
@@ -334,6 +337,7 @@ class Goodup extends Base
                 "demo_fee"=>$demo_fee,
                 "open_fee"=>$open_fee,
                 "noble_metal"=>$noble_metal,
+                "cgd_gold_price"=>$cgd_gold_price,
                 "noble_weight"=>$noble_weight,
                 "is_gold_price"=>$is_gold_price,
                 "market_price"=>$market_price,
@@ -1614,10 +1618,6 @@ class Goodup extends Base
         if($good==false){
             return error_show(1005,"商品数据未找到");
         }
-//        $nake_fee=isset($this->post['nake_fee'])&&$this->post['nake_fee']!="" ? floatval($this->post['nake_fee']):"";
-//        if($nake_fee==""){
-//            return error_show(1005,"参数nake_fee不能为空");
-//        }
         $num=isset($this->post['min_num'])&&$this->post['min_num']!=="" ? intval($this->post['min_num']):"";
         if($num==""){
             return error_show(1005,"参数min_num不能为空");
@@ -1630,13 +1630,12 @@ class Goodup extends Base
         $catinfo = Db::name("cat")->where(["id"=>$good['cat_id']])->find();
         $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']/100:0;
         if($good['is_gold_price']==1){
-            $gold = Db::name("gold_price1")->where(["type"=>$good['noble_metal'],"is_del"=>0,"status"=>1])->order("addtime desc")
-                ->find();
-            $saleprice = $good['open_fee']/$num + $good['weight']*$gold["price"] + $nakelist['cost_fee']/(1-$budget)*
-                $good['noble_weight']+$good['mark_fee']+$good['packing_fee']+$good['cert_fee']+$nakelist['nake_fee'];
+//            $gold = Db::name("gold_price1")->where(["type"=>$good['noble_metal'],"is_del"=>0,"status"=>1])->order("addtime desc")
+//                ->find();
+            $saleprice =  $good['noble_weight']*$good["cgd_gold_price"] + $nakelist['cost_fee']/(1-$budget)*
+                $good['noble_weight']+$good['mark_fee']+$good['packing_fee']+$good['cert_fee']+$nakelist['nake_fee']+$nakelist['delivery_fee'];
         }else{
-            $saleprice = $good['open_fee']/$num + $good['cost_fee']*
-                $good['noble_weight']+$good['mark_fee']+$good['packing_fee']+$good['cert_fee']+$nakelist['nake_fee']/(1-$budget);
+            $saleprice =$good['mark_fee']+$good['packing_fee']+$good['cert_fee']+$nakelist['delivery_fee']+$nakelist['nake_fee']/(1-$budget);
         }
         return app_show(0,"获取成功",["sale_price"=>round($saleprice,2)]);
     }

+ 7 - 8
app/admin/controller/Sale.php

@@ -4,19 +4,18 @@ namespace app\admin\controller;
 
 use app\admin\model\GoodLog;
 use app\admin\model\ProcessOrder;
-use app\BaseController;
 use Exception;
 use think\App;
 use think\facade\Db;
 use app\admin\model\ActionLog;
-class Sale extends BaseController
+
+class Sale extends Base
 {
-    public $post = "";
 
     public function __construct(App $app)
     {
         parent::__construct($app);
-        $this->post = $this->request->post();
+
     }
 
     public function create()
@@ -96,10 +95,10 @@ class Sale extends BaseController
 
         }
         if($goodinfo['is_stock']==1){
-//            $stock =Db::name("good_stock")->where(["spuCode"=>$spuCode,"is_del"=>0])->find();
-//            if($stock==false||$stock['usable_stock']<$good_num){
-//                return error_show(1003,"库存数量不足");
-//            }
+            $stock =Db::name("good_stock")->where(["spuCode"=>$spuCode,"is_del"=>0])->find();
+            if($stock==false||$stock['usable_stock']<$good_num){
+                return error_show(1003,"库存数量不足");
+            }
         }
         $origin = Db::name("good_nake")->where([["spuCode","=",$spuCode],["min_num","<=",$good_num],["is_del","=",
             0]])->order("min_num desc")->find();