update: 拼单活动商品排序

application/services/marketing/MarketingService.php

@@ -1017,13 +1017,17 @@ class MarketingService
                 }
             }
 
-            foreach ($goodsSkuList as $key => $item) {
-                if ($item["inventory_rest"] == 0) {
-                    unset($goodsSkuList[$key]);
-                    array_push($goodsSkuList, $item);
+            //前端排序，后端不排库存
+            if (!empty($params["from"])) {
+                foreach ($goodsSkuList as $key => $item) {
+                    if ($item["inventory_rest"] == 0) {
+                        unset($goodsSkuList[$key]);
+                        array_push($goodsSkuList, $item);
+                    }
                 }
+                $goodsSkuList = array_values($goodsSkuList);
             }
-            $goodsSkuList = array_values($goodsSkuList);
+
         }
 
         $takePlaceIds = MarketingTakePlace::getRecords(["marketing_id" => $marketingData["id"]], ["take_place_id"]);