Merge branch 'goods_snapshot_0913' into test

dfbfb97d · jianghaiming · 68a26f4c · 17d5d446 · dfbfb97d
Commit dfbfb97d authored Sep 13, 2021 by jianghaiming
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

MarketingService.php application/services/marketing/MarketingService.php +3 -0

No files found.
--- a/application/services/marketing/MarketingService.php
+++ b/application/services/marketing/MarketingService.php
@@ -1200,6 +1200,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'] = !emptysudo($params['marketing_type']) ? $params['marketing_type'] : '';
+        }
        $marketing_list = Marketing::getMarketingList($where);
        return $marketing_list;
    }