Merge branch 'master_luhongguang_fix'

application/services/marketing/MarketingService.php

@@ -1016,6 +1016,14 @@ class MarketingService
                     $goodsSkuList[$key]["all_have_buy_goods_count"] = $allHaveBuyGoodsStatistics[$item["goods_sku_id"]];
                 }
             }
+
+            foreach ($goodsSkuList as $key => $item) {
+                if ($item["inventory_rest"] == 0) {
+                    unset($goodsSkuList[$key]);
+                    array_push($goodsSkuList, $item);
+                }
+            }
+            $goodsSkuList = array_values($goodsSkuList);
         }
 
         $takePlaceIds = MarketingTakePlace::getRecords(["marketing_id" => $marketingData["id"]], ["take_place_id"]);