Merge branch 'jielong' of https://gitlab.yidian-inc.com/bp/goods into jielong

application/models/goods/mysql/Ota.php

@@ -17,4 +17,12 @@ class Ota extends MysqlBase
 
     const STATUS_NORMAL = 0;    // 正常
     const STATUS_DELETE = 1;    // 删除
+
+    public static function getRecord($where, $columns = [])
+    {
+        if (empty($columns)) {
+            $columns = '*';
+        }
+        return self::get($columns, $where);
+    }
 }

application/services/goods/MarketingPindanGoodsService.php

@@ -88,6 +88,13 @@ class MarketingPindanGoodsService
                 $ksyun = GoodsService::getUrlList($sku["desc_pic_url"]);
                 $data["goods_info"]["desc_pic_url_list"] = $ksyun;
             }
+            $data["goods_info"]["ota_name"] = "";
+            if (!empty($sku["ota_id"])) {
+                $ota = Ota::getRecord(["ota_id" => $sku["ota_id"]], ["ota_name"]);
+                if (!empty($ota)) {
+                    $data["goods_info"]["ota_name"] = $ota["ota_name"];
+                }
+            }
         }
         return $data;
     }
@@ -392,7 +399,7 @@ class MarketingPindanGoodsService
         $count = PindanGoodsSku::count("*", $where);
         if (!empty($list)) {
             foreach ($list as $key => $item) {
-                $list[$key]["original_price"] = $item["original_price"] / 100;
+                $list[$key]["original_price"] = (int)$item["original_price"] / 100;
                 $list[$key]["price"] = $item["price"] / 100;
                 if (!empty($otaData) && !empty($otaData[$item["ota_id"]])) {
                     $list[$key]["ota_name"] = $otaData[$item["ota_id"]]["ota_name"];