Merge branch 'feature/new_customer' of http://git.dev.yoho.cn/web/yohobuy into feature/new_customer

@@ -680,7 +680,7 @@ class Helpers
      * @param int $count 计商品件数
      * @return array $arr 处理之后的加价购商品数据
      */
-    public static function formatAdvanceGoods($advanceGoods, &$count = 0)
+    public static function formatAdvanceGoods($advanceGoods, $isGift = false, &$count = 0)
     {
         $arr = array();
 
@@ -699,7 +699,7 @@ class Helpers
                 $oneGoods['name'] = $single['product_name'];
                 $oneGoods['thumb'] = !empty($single['goods_images']) ? Images::getImageUrl($single['goods_images'], 120, 160) : '';
                 $oneGoods['price'] = self::transPrice($single['last_price']);
-                $oneGoods['marketPrice'] = '0.00';
+                $oneGoods['marketPrice'] = $isGift ? '0.00' : self::transPrice($single['market_price']);
                 $oneGoods['count'] = $single['storage_number'];
 
                 $gift['goods'][] = $oneGoods;

@@ -849,7 +849,7 @@ class CartModel
 
             if ($onlyGift) {
                 // 赠品
-                $result['freebie'] = Helpers::formatAdvanceGoods($data['gift_list']);
+                $result['freebie'] = Helpers::formatAdvanceGoods($data['gift_list'], true);
                 break;
             }
             if ($onlyAdvanceBuy) {