m

app/Http/Controllers/Admin/OrderController.php

@@ -494,7 +494,10 @@ 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;
             $data = array();
             $data['id'] = $v['id'];
             $data['goods_name'] = $goods_name;
@@ -881,7 +884,10 @@ 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;
             $data = array();
             $data['id'] = $val['id'];
             $data['goods_name'] = $goods_name;