Merge branch 'colonel' of https://git.yidian-inc.com:8021/bp/goods into colonel

application/services/marketing/MarketingGoodsService.php

@@ -81,8 +81,11 @@ class MarketingGoodsService
                 $goodsSkuId =  array_column($data, 'goods_sku_id');
             }
 
-            $goodsSkuList = GoodsSku::getRecordMaster(['goods_sku_id' => $goodsSkuId]);
-            $goodsSkuList = !empty($goodsSkuList) ? array_column($goodsSkuList,null,'goods_sku_id') : [];
+            $goodsSkuList = [];
+            if (!empty($goodsSkuId)) {
+                $goodsSkuList = GoodsSku::getRecordMaster(['goods_sku_id' => $goodsSkuId]);
+                $goodsSkuList = !empty($goodsSkuList) ? array_column($goodsSkuList,null,'goods_sku_id') : [];
+            }
             $lastData = end($data);
             $lastId = !empty($lastData['id']) ? $lastData['id'] : '';
 
@@ -91,8 +94,11 @@ class MarketingGoodsService
                 $shopId[$key] = !empty($goodsSkuList[$value['goods_sku_id']]['shop_id']) ? $goodsSkuList[$value['goods_sku_id']]['shop_id'] : '';
             }
 
-            $subShopList = SubShop::getRecordMaster(['shop_id' => $shopId]);
-            $subShopList = !empty($subShopList) ? array_column($subShopList,null,'shop_id') : [];
+            $subShopList = [];
+            if (!empty($shopId)) {
+                $subShopList = SubShop::getRecordMaster(['shop_id' => $shopId]);
+                $subShopList = !empty($subShopList) ? array_column($subShopList,null,'shop_id') : [];
+            }
 
             $marketingList =  !empty($marketingList) ? array_column($marketingList,null,'marketing_id') : [];
 

application/services/marketing/MarketingService.php

@@ -826,11 +826,16 @@ class MarketingService
             }
         }
         $marketingGoods = [];
-        foreach ($skuInfoList as $key => $skuInfo) {
-            $marketingGoods[$key]["goods_spu_id"] = $skuInfo["goods_spu_id"];
-            $marketingGoods[$key]["goods_sku_id"] = $skuInfo["goods_sku_id"];
+        $tempSkuInfoList = array_column($skuInfoList, null, "goods_sku_id");
+        foreach ($goodsSkuId as $key => $skuId) {
+            if (empty($tempSkuInfoList[$skuId]["goods_spu_id"])) {
+                continue;
+            }
+            $marketingGoods[$key]["goods_spu_id"] = $tempSkuInfoList[$skuId]["goods_spu_id"];
+            $marketingGoods[$key]["goods_sku_id"] = $skuId;
             $marketingGoods[$key]["marketing_id"] = $marketingId;
         }
+
         MarketingGoods::save($marketingGoods);
 
         //自提点
@@ -989,10 +994,9 @@ class MarketingService
         $pindanMarketing = MarketingPindan::getRecord(['marketing_id' => $params['marketing_id']]);
         $lifeAccountList = CommonService::getlifeAccountList(['life_account_id' => [$pindanMarketing["publish_life_account_id"]]]);
 
-        $goodsSkuList = MarketingGoods::marketingGoodsList(['marketing_id' => $params['marketing_id']]);
-
-        if (!empty($goodsSkuList)) {
-            $goodsSkuId = array_column($goodsSkuList , 'goods_sku_id');
+        $marketingGoodsList = MarketingGoods::marketingGoodsList(['marketing_id' => $params['marketing_id'], "ORDER" => ["id" => "ASC"]]);
+        if (!empty($marketingGoodsList)) {
+            $goodsSkuId = array_column($marketingGoodsList , 'goods_sku_id');
             $goodsSkuList = PindanGoodsSku::select('*', ['goods_sku_id' => $goodsSkuId]);
         }
         empty($goodsSkuList) && $goodsSkuList = [];
@@ -1046,7 +1050,14 @@ class MarketingService
                 $otasData[$item["ota_id"]] = $item;
             }
 
-            foreach ($goodsSkuList as $key => $item) {
+            //这里是为了排序，按查 marketing_goods 出来的顺序排序
+            $tempGoodsSkuList = array_column($goodsSkuList, null, "goods_sku_id");
+            foreach ($marketingGoodsList as $key => $value) {
+                if (empty($tempGoodsSkuList[$value["goods_sku_id"]])) {
+                    continue;
+                }
+                $item = $tempGoodsSkuList[$value["goods_sku_id"]];
+                $goodsSkuList[$key] = $item;
                 $goodsSkuList[$key]["desc_pic_url_list"] = GoodsService::getUrlList($item["desc_pic_url"]);
                 $goodsSkuList[$key]["ota_name"] = empty($otasData[$item["ota_id"]]["ota_name"]) ? "" : $otasData[$item["ota_id"]]["ota_name"];
                 $goodsSkuList[$key]["original_price"] = empty($item["original_price"]) ? '' : sprintf("%.2f", (int)$item["original_price"] / 100);
@@ -1065,6 +1076,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"]);