update: 拼单活动商品排序

application/services/marketing/MarketingService.php

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