update:修改分享

application/services/goods/GoodsService.php

@@ -1145,14 +1145,31 @@ class GoodsService
 
         //是否是分销活动
         $runningMarketing = MarketingGoodsService::getRunningMarketing([$params["goods_sku_id"]]);
+
         $data["goods_info"]["is_fenxiao"] = false;
         if (!empty($runningMarketing[$params["goods_sku_id"]])) {
             $data["goods_info"]["is_fenxiao"] = true;
         }
 
+        $marketingInfoList = MarketingGoods::select(["marketing_id", "goods_sku_id"], ["goods_sku_id" => $params["goods_sku_id"]]);
 
-        $data["goods_info"]['goods_share_code'] = CommonService::getGoodsShareId($params);
+        if (!empty($marketingInfoList)) {
+            foreach ($marketingInfoList as $marketingInfo) {
+                $marketingInfoIds[$marketingInfo["goods_sku_id"]] = $marketingInfo["marketing_id"];
+            }
+            $marketingIds = array_values($marketingInfoIds);
 
+            $now = date("Y-m-d H:i:s");
+            $resMarketingList = Marketing::select("*", ["start_time[<]" => $now, "end_time[>]" => $now, "marketing_id" => $marketingIds, "marketing_type" => Marketing::MARKETING_TYPE_FENXIAO]);
+            if (!empty($resMarketingList)) {
+                foreach ($resMarketingList as $res) {
+                    $marketingList[$res["marketing_id"]] = $res;
+                }
+            }
+        }
+
+        $marketing = !empty($marketingList) ? current($marketingList) : [];
+        $data["goods_info"]['goods_share_code'] = CommonService::getGoodsShareId($params);
         //当前人是否是团长
         $data["goods_info"]["is_tuanzhang"] = false;
         if (!empty($params["user_id"])) {
@@ -1161,7 +1178,11 @@ class GoodsService
                 $data["goods_info"]["is_tuanzhang"] = true;
                 if (!empty($runningMarketing)) {
                     //分销返现多少钱
+                    if (!empty($marketing) && $marketing['commission_mode']) {
                         $data["goods_info"]["cash_back"] = sprintf("%.2f",$runningMarketing[$params["goods_sku_id"]] * $data["goods_info"]["price"]);
+                    }else{
+                        $data["goods_info"]["cash_back"] = sprintf("%.2f",$runningMarketing[$params["goods_sku_id"]]);
+                    }
                 }
             }
         }
@@ -1219,6 +1240,7 @@ class GoodsService
                 $nameList = Category::select("name", ["category_id" => [$item["category_1_id"], $item["category_2_id"]]]);
                 $list[$key]["category_1_name"] = $nameList[0];
                 $list[$key]["category_2_name"] = $nameList[1];
+
             }
         }
         return ["list" => $list, "count" => $count];

application/services/marketing/MarketingGoodsService.php

@@ -193,11 +193,11 @@ class MarketingGoodsService
 
             $data = [];
             foreach ($marketingInfoIds as $goodsSkuId => $marketingId) {
-                if (!empty($marketingList[$marketingId]["second_commission_value"]) && $marketingList[$marketingId]["second_commission_value"] == 1) {
+                if (!empty($marketingList[$marketingId]["second_commission_value"]) && $marketingList[$marketingId]["commission_mode"] == 1) {
                     $data[$goodsSkuId] =  substr(sprintf("%.4f", $marketingList[$marketingId]["second_commission_value"]/10000), 0, -2);
                 }
 
-                if (!empty($marketingList[$marketingId]["second_commission_value"]) && $marketingList[$marketingId]["second_commission_value"] == 2) {
+                if (!empty($marketingList[$marketingId]["second_commission_value"]) && $marketingList[$marketingId]["commission_mode"] == 2) {
                     $data[$goodsSkuId] =  substr(sprintf("%.4f", $marketingList[$marketingId]["second_commission_value"]/100), 0, -2);
                 }
             }