非库存商品的库存数改为最大

app/admin/controller/Activity.php

@@ -451,7 +451,10 @@ class Activity extends Base
             foreach ($good as $value){
                 $temp=[];
                 $stock =Db::name("good_stock")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->sum('usable_stock');
-                $temp['stock_num'] = intval($stock);
+
+                //如果是非库存商品，库存数改为最大(即将库存设为无限)
+                $temp['stock_num'] = $value['is_stock'] == 1 ? intval($stock) : 9999;
+
                 $temp['skuCode']=$value['skuCode'];
                 $temp['spuCode']=$value['spuCode'];
                 $temp['is_stock']=$value['is_stock'];

app/admin/controller/Sale.php

@@ -2754,6 +2754,8 @@ class Sale extends Base
         $outinfo['sendtime'] = date("Y-m-d H:i:s");
         $outinfo['status'] = 2;
         $outinfo['updatetime'] = date("Y-m-d H:i:s");
+
+        Db::startTrans();
         try{
             $up =Db::name("order_out")->save($outinfo);
             if($up){
@@ -2943,7 +2945,7 @@ class Sale extends Base
             return error_show(1002, "未找到商品数据");
         }
 
-        $stock = 9999;//默认库存数为9999，无实际意义，表示库存不限，只有库存商品才需要去数据库里查验可用库存
+        $stock = 0;
         if ($ct['is_stock'] == 1) {
             $good_stock = Db::name("good_stock")->where(["spuCode" => $ct['spuCode'], "is_del" => 0])->find();
             $stock = isset($good_stock['usable_stock']) ? $good_stock['usable_stock'] : "0";