Merge branch 'master' into tuancan

application/services/marketing/MarketingService.php

@@ -289,6 +289,8 @@ class MarketingService
             foreach ($list as $key => $value) {
                 $marketingIds[] = $value["marketing_id"];
             }
+            //参与人数：当前拼单成功支付的订单总数量
+            $userCount = self::getHaveBuyGoodsUserCount(["marketing_id" => $marketingIds]);
 
             $marketingPindanData = MarketingPindan::select(["marketing_id", "publish_life_account_id",
                     "min_price", "max_price", "pindan_desc","participate_number", "pindan_pic"]
@@ -325,7 +327,7 @@ class MarketingService
                     $lists[$key]["max_price"] = sprintf("%.2f", $priceData[$value["marketing_id"]]["max_price"] / 100);
                     $lists[$key]["pindan_pic_url"] = $picUrl;
                     $lists[$key]["pindan_desc"] = $priceData[$value["marketing_id"]]["pindan_desc"];
-                    $lists[$key]["participate_number"] = $priceData[$value["marketing_id"]]["participate_number"];
+                    $lists[$key]["participate_number"] = empty($userCount[$value['marketing_id']]) ? 0 : $userCount[$value['marketing_id']];
 
                     $shareDefaultStr = empty($priceData[$value["marketing_id"]]["pindan_pic"]) ? $defaultPic : $priceData[$value["marketing_id"]]["pindan_pic"];
                     $strList = explode(",", $shareDefaultStr);
@@ -663,11 +665,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);
 
         //自提点
@@ -961,7 +968,8 @@ class MarketingService
         }
         empty($goodsSkuList) && $goodsSkuList = [];
 
-
+        $userCount = self::getHaveBuyGoodsUserCount(["marketing_id" => $params['marketing_id']]);
+        $userCount = empty($userCount[$params['marketing_id']]) ? 0 : $userCount[$params['marketing_id']];
 
         $marketingData["life_account_name"] = $marketingData["life_account_icon"] = "";
         if (!empty($lifeAccountList[$pindanMarketing["publish_life_account_id"]])) {
@@ -981,7 +989,7 @@ class MarketingService
         $marketingData["pindan_desc"] = $pindanMarketing["pindan_desc"];
         $marketingData["max_price"] = sprintf("%.2f", $pindanMarketing["max_price"] / 100);
         $marketingData["min_price"] = sprintf("%.2f", $pindanMarketing["min_price"] / 100);
-        $marketingData["participate_number"] = $pindanMarketing["participate_number"];
+        $marketingData["participate_number"] = $userCount;
         $marketingData["create_time"] = $marketingInfo["create_time"];
 
         $defaultPic = "SHQ_goods_0_012Xh1AQcMqu";
@@ -1034,16 +1042,21 @@ class MarketingService
                 $allHaveBuyGoodsSkuIds = array_keys($allHaveBuyGoodsStatistics);
                 if (in_array($item["goods_sku_id"], $allHaveBuyGoodsSkuIds)) {
                     $goodsSkuList[$key]["all_have_buy_goods_count"] = $allHaveBuyGoodsStatistics[$item["goods_sku_id"]];
+                    $goodsSkuList[$key]["total_amount_sold"] = $allHaveBuyGoodsStatistics[$item["goods_sku_id"]];
                 }
             }
 
-            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"]);
@@ -1177,4 +1190,24 @@ class MarketingService
         }
         return $data;
     }
+
+    /**
+     * 参与人数：当前拼单成功支付的订单总数量，退款订单不刨除
+     * @param array $params
+     * @return array|mixed
+     * @throws InterfaceException
+     */
+    public static function getHaveBuyGoodsUserCount($params = [])
+    {
+        $url = config('interface', 'order.order.have_buy_goods_user_count');
+        if (empty($url)) {
+            throw new InterfaceException(['cus' => 0]);
+        }
+        $res = HttpUtil::get($url, $params);
+        $data = [];
+        if ($res['code'] == 0 && isset($res['response']["result"])) {
+            $data = $res["response"]["result"];
+        }
+        return $data;
+    }
 }
\ No newline at end of file