Merge branch 'jielong' into test

application/services/marketing/MarketingService.php

@@ -953,7 +953,7 @@ class MarketingService
             $takePlaces = TakePlace::select("*", ["take_place_id" => $takePlaceIds]);
         }
 
-        $info['goods_list'] = $goodsSkuList;
+        $info['goods_list'] = !empty($goodsSkuList) : $goodsSkuList : [];
         $info['take_place'] = $takePlaces;
         return $info;
     }