ad

app/admin/controller/Sale.php

@@ -91,34 +91,46 @@ class Sale extends BaseController
             }
 
         }
-        $good = Db::name("good_ladder")->where(["skuCode"=>$skuCode,"is_del"=>0,"status"=>1])->where([["min_num",
-            "<=",$good_num]])->order("min_num desc")->find();
-        if($good==false){
-            return error_show(1003,"未找到相关阶梯价格");
+        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,"库存数量不足");
+//            }
         }
-        $sale_price = $good['sale_price'];
         $origin = Db::name("good_nake")->where([["spuCode","=",$spuCode],["min_num","<=",$good_num],["is_del","=",
             0]])->order("min_num desc")->find();
         if($origin==false){
             return error_show(1003,"未找到相关阶梯成本价格");
         }
         $origin_price = $origin['nake_fee'];
-        if($is_activity==1){
-            $act = Db::name("activity_info")->alias("a")->leftJoin("good_activity b","a.activity_code=b.activity_code")
-                ->where(["a.skuCode"=>$skuCode,"a.is_del"=>0,"a.status"=>1,"b.status"=>6,"b.is_del"=>0])->find();
-            if($act==false){
-                return error_show(1003,"未找到相关活动价");
-            }
-            if($act['moq_num']>$good_num){
-                return error_show(1003,"商品不满足活动价起订量{$act['moq_num']}");
+        $sale_price = isset($this->post['good_price'])&&$this->post['good_price']!="" ? floatval($this->post['good_price']):0;
+
+        if($goodtype==1){
+            $good = Db::name("good_ladder")->where(["skuCode"=>$skuCode,"is_del"=>0,"status"=>1])->where([["min_num",
+                "<=",$good_num]])->order("min_num desc")->find();
+            if($good==false){
+                return error_show(1003,"未找到相关阶梯价格");
             }
-            if($act['activity_stock']<$good_num){
-                return error_show(1003,"商品活动库存剩余{$act['moq_num']}");
+            $sale_price = $good['sale_price'];
+            if($is_activity==1){
+                $act = Db::name("activity_info")->alias("a")->leftJoin("good_activity b","a.activity_code=b.activity_code")
+                    ->where(["a.skuCode"=>$skuCode,"a.is_del"=>0,"a.status"=>1,"b.status"=>6,"b.is_del"=>0])->find();
+                if($act==false){
+                    return error_show(1003,"未找到相关活动价");
+                }
+                if($act['moq_num']>$good_num){
+                    return error_show(1003,"商品不满足活动价起订量{$act['moq_num']}");
+                }
+                if($act['activity_stock']<$good_num){
+                    return error_show(1003,"商品活动库存剩余{$act['moq_num']}");
+                }
+                $sale_price=$act['activity_price'];
             }
-            $sale_price=$act['activity_price'];
         }
 
 
+
+
         $cgd=[
             "supplierNo"=>$ct['supplierNo'],
             "companyNo"=>$supplierNo,