Merge branch 'goods_snapshot_0913' into pre_release

application/modules/Goods/controllers/Goods.php

@@ -339,4 +339,14 @@ class GoodsController extends Base
         $res = GoodsService::getOtaInfoByGoodsSkuIds($this->params);
         $this->success(["result" => $res]);
     }
+
+    /**
+     * 拼单商品快照批量获取
+     * @throws Exception
+     */
+    public function goods_snapshotsAction()
+    {
+        $res = GoodsSnapshotsService::goodsSnapshots($this->params);
+        $this->success(["result" => $res]);
+    }
 }
\ No newline at end of file

application/services/goods/GoodsSnapshotsService.php

@@ -3,6 +3,8 @@
 namespace App\Services\goods;
 
 
+use Api\PhpUtils\Common\GoodsSkuId;
+use App\Models\goods\mysql\GoodsSnapshot;
 use App\Models\goods\mysql\PindanGoodsSnapshot;
 
 class GoodsSnapshotsService
@@ -32,4 +34,42 @@ class GoodsSnapshotsService
         }
         return $pindanGoodsSnapshot;
     }
+
+    /**
+     * 批量支持商品
+     * @param $params
+     * @return array
+     */
+    public static function goodsSnapshots($params)
+    {
+        $str = empty($params["snapshots_str"]) ? "" : $params["snapshots_str"];
+        $snapshot = [];
+        if (!empty($str)) {
+            $paramsArr = json_decode($str, true);
+            if (!empty($paramsArr)) {
+                foreach ($paramsArr as $param) {
+                    if (isset($param["goods_sku_id"]) || isset($param["goods_version"])) {
+                        $goodsSkuIdParams = GoodsSkuId::getGoodsSkuIdParams($param["goods_sku_id"]);
+                        $key = $param["goods_sku_id"]."_".$param["goods_version"];
+                        if ($goodsSkuIdParams["table_tag"] == GoodsSkuId::TABLE_TAG_PINDAN) {
+                            $snapshot[$key] = PindanGoodsSnapshot::getRecord([
+                                "goods_sku_id" => $param["goods_sku_id"],
+                                "goods_version" => $param["goods_version"]
+                            ]);
+                        } else {
+                            $snapshot[$key] = GoodsSnapshot::getRecord([
+                                "goods_sku_id" => $param["goods_sku_id"],
+                                "goods_version" => $param["goods_version"]
+                            ]);
+                        }
+                        if (!empty($snapshot[$key]["desc_pic_url"])) {
+                            $ksyun = GoodsService::getUrlList($snapshot[$key]["desc_pic_url"]);
+                            $snapshot[$key]["desc_pic_url_list"] = $ksyun;
+                        }
+                    }
+                }
+            }
+        }
+        return $snapshot;
+    }
 }
\ No newline at end of file

application/services/marketing/MarketingService.php

@@ -1182,6 +1182,9 @@ class MarketingService
     public static function getMarketingList($params)
     {
         $where['marketing_id'] = !empty($params['marketing_id']) ? $params['marketing_id'] : '';
+        if(!empty($params['marketing_type'])){
+            $where['marketing_type'] = !empty($params['marketing_type']) ? $params['marketing_type'] : '';
+        }
         $marketing_list = Marketing::getMarketingList($where);
         return $marketing_list;
     }