Merge remote-tracking branch 'origin/master'

app/GoodsSkus.php

@@ -13,5 +13,13 @@ class GoodsSkus extends Model
 {
     public $timestamps = false;
     protected $table = "goods_skus";
+
+    public static function actualQuantity($sku_id){
+    	//计算实际库存 -还未到卖家云的量
+    	$sku_quantity = GoodsSkus::where('id', $sku_id)->pluck('quantity');
+        $w_num = OrderGoodsSkus::where('sku_id', $sku_id)->where('is_del',0)->where('mj_status',0)->sum('num');
+        $quantity = $sku_quantity - $w_num;
+        return $quantity;
+    }
    
 }

app/Http/Controllers/Admin/GoodsController.php

@@ -61,6 +61,9 @@ class GoodsController extends Controller
         foreach($result as $k=>&$v){
             # 获取sku
             $skuList = GoodsSkus::where('goodsCode', $v['id'])->where('is_del', 0)->get();
+            foreach($skuList as $k=>&$item){
+                $item->quantity = GoodsSkus::actualQuantity($item->id);
+            }
             $v['sku_list'] = $skuList;            
         }
 

app/Http/Controllers/Admin/OrderController.php

@@ -494,7 +494,16 @@ class OrderController extends Controller
         foreach($gift_info as $k=>$v){
             //获取礼品信息
             $goods_name = Goods::where('id', $v['goods_id'])->pluck('name');
-            $sku = GoodsSkus::where('id', $v['sku_id'])->first();
+            $sku = GoodsSkus::where('id', $v['sku_id'])->where('is_del', 0)->where(function($query){
+                $query->where('is_white', 1)->orWhere('quantity','>',0);
+            })->first();
+            if(empty($sku)) continue;
+            //计算实际库存 -还未到卖家云的量
+            $quantity = GoodsSkus::actualQuantity($v['sku_id']);
+            if($quantity<=0){
+                continue;
+            }
+
             $data = array();
             $data['id'] = $v['id'];
             $data['goods_name'] = $goods_name;
@@ -860,8 +869,7 @@ class OrderController extends Controller
             foreach($goods as $k=>&$v){
                 $v['num'] = $order_skus[$v['sku_id']];
                 //计算实际库存 -还未到卖家云的量
-                $w_num = DB::table('order_goods_skus')->where('sku_id', $v['sku_id'])->where('is_del',0)->where('order_id','!=',$id)->where('mj_status',0)->sum('num');
-                $v['quantity'] = $v['quantity'] - $w_num;
+                $v['quantity'] = GoodsSkus::actualQuantity($v['sku_id']);
             }
             $order['goods'] = $goods;
         }
@@ -881,7 +889,16 @@ class OrderController extends Controller
         foreach($gift_info as $k=>$val){
             //获取礼品信息
             $goods_name = Goods::where('id', $val['goods_id'])->pluck('name');
-            $sku = GoodsSkus::where('id', $val['sku_id'])->first();
+            $sku = GoodsSkus::where('id', $val['sku_id'])->where('is_del', 0)->where(function($query){
+                $query->where('is_white', 1)->orWhere('quantity','>',0);
+            })->first();
+            if(empty($sku)) continue;
+            //计算实际库存 -还未到卖家云的量
+            $quantity = GoodsSkus::actualQuantity($val['sku_id']);
+            if($quantity<=0){
+                continue;
+            }
+
             $data = array();
             $data['id'] = $val['id'];
             $data['goods_name'] = $goods_name;