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

hf
Commit f24429da01a99452b900b22426a84fb9ecfe1ff4 2 parents 201b3701 d2d99826
Showing 1 changed file with 5 additions and 0 deletions
library/Plugin/Helpers.php
--- a/library/Plugin/Helpers.php
View file @f24429d
+++ b/library/Plugin/Helpers.php
View file @f24429d
@@ -595,9 +595,13 @@ class Helpers
                 $oneGoods['inValid'] = true;
             } elseif ($value['goods_type'] == 'gift' && !isset($value['isAdvanceBuy'])) {
                 $oneGoods['isGift'] = true;
+                $oneGoods['salesPrice'] = self::transPrice($value['sales_price']);
+                $oneGoods['price'] = self::transPrice($value['sale_price']);
             } elseif ($value['goods_type'] == 'price_gift') {
                 $oneGoods['showCheckbox'] = true;
                 $oneGoods['isAdvanceBuy'] = true;
+                $oneGoods['salesPrice'] = self::transPrice($value['sales_price']);
+                $oneGoods['price'] = self::transPrice($value['sale_price']);
             } else {
                 $oneGoods['showCheckbox'] = true;
             }
@@ -634,6 +638,7 @@ class Helpers
             $gift['promotionTitle'] = $value['promotion_title'];
             foreach ($value['goods_list'] as $single) {
+                $oneGoods = array();
                 $oneGoods['id'] = $single['product_skn'];
                 $oneGoods['name'] = $single['product_name'];
                 $oneGoods['thumb'] = !empty($single['goods_images']) ? Images::getImageUrl($single['goods_images'], 120, 160) : '';