赠品和加价购标志只保留一个

Code Review By Rock Zhang

@@ -580,7 +580,7 @@ class Helpers
 		    //gift=>是否赠品,advanceBuy=>是否加价购,soldOut=>失效商品;
 		    if (!isset($value['goods_type'])) {
 			    $oneGoods['isSoldOut'] = true;
-		    } elseif ($value['goods_type'] == 'gift') {
+		    } elseif ($value['goods_type'] == 'gift' && !isset($value['isAdvanceBuy'])) {
 			    $oneGoods['isGift'] = true;
 		    } elseif ($value['goods_type'] == 'price_gift') {
 			    $oneGoods['isAdvanceBuy'] = true;

@@ -25,7 +25,7 @@ class ShoppingCartController extends AbstractAction
             'shoppingCartPage' => true,
             'shoppingCart' => CartModel::getCartData($uid, $shoppingKey)
         );
-        print_r($data);
+
         // 渲染模板
         $this->_view->display('index', $data);
     }