Merge branch 'jielong' into 'test'

fixed: original_price zero bug

See merge request bp/goods!6

application/services/marketing/MarketingService.php

@@ -941,7 +941,7 @@ class MarketingService
             foreach ($goodsSkuList as $key => $item) {
                 $goodsSkuList[$key]["desc_pic_url_list"] = GoodsService::getUrlList($item["desc_pic_url"]);
                 $goodsSkuList[$key]["ota_name"] = empty($otasData[$item["ota_id"]]["ota_name"]) ? "" : $otasData[$item["ota_id"]]["ota_name"];
-                $goodsSkuList[$key]["original_price"] = sprintf("%.2f", (int)$item["original_price"] / 100);
+                $goodsSkuList[$key]["original_price"] = empty($item["original_price"]) ? '' : sprintf("%.2f", (int)$item["original_price"] / 100);
                 $goodsSkuList[$key]["price"] = sprintf("%.2f", $item["price"] / 100);
             }
         }