添加格式化购物车商品，格式化加价购商品辅助函数，添加对商品的数据格式处理

Code Review By Rock Zhang

@@ -556,6 +556,86 @@ class Helpers
     }
 
     /**
+     * 格式化购物车商品
+     *
+     * @param array $cartGoods 购物车商品列表
+     * @param bool $haveLink 控制是否需要商品链接
+     */
+    public static function formatCartGoods($cartGoods, $haveLink = false)
+    {
+        $arr = array();
+
+	    $oneGoods = array();
+	    foreach ($cartGoods as $key => $value) {
+			$oneGoods['id'] = $value['product_sku'];
+			$oneGoods['skn'] = $value['product_skn'];
+			$oneGoods['name'] = $value['product_name'];
+			$oneGoods['thumb'] = !empty($value['goods_images']) ? Images::getImageUrl($value['goods_images'], 120, 120) : '';
+			$oneGoods['color'] = $value['color_name'];
+			$oneGoods['size'] = $value['size_name'];
+			$oneGoods['appearDate'] = '12月'; // 目前app接口没有返回该数据
+			$oneGoods['price'] = $value['real_price'];
+			$oneGoods['count'] = $value['buy_number'];
+			$oneGoods['lowStocks'] = ($value['buy_number'] < $value['storage_number']);
+		    //gift=>是否赠品,advanceBuy=>是否加价购,soldOut=>失效商品;
+		    if (!isset($value['goods_type'])) {
+			    $oneGoods['soldOut'] = true;
+		    } elseif ($value['goods_type'] == 'gift') {
+			    $oneGoods['gift'] = true;
+		    } elseif ($value['goods_type'] == 'price_gift') {
+			    $oneGoods['advanceBuy'] = true;
+		    }
+		    // 上市期
+		    if (!empty($value['expect_arrival_time'])) {
+			    $oneGoods['appearDate'] = $value['expect_arrival_time'];
+		    }
+		    // 商品链接
+		    if ($haveLink && isset($value['product_id'])) {
+			    $oneGoods['link'] = self::url('/product/pro_' . $value['product_id'] . '_' . $value['goods_id'] . '/' . $value['cn_alphabet'] . '.html');
+		    }
+
+		    $arr[$key] = $oneGoods;
+		}
+
+        return $arr;
+    }
+
+    /**
+     * 格式化加价购商品
+     *
+     * @param array $advanceGoods 加价购商品列表
+     * @param bool $haveLink 控制是否需要商品链接
+     */
+    public static function formatAdvanceGoods($advanceGoods)
+    {
+        $arr = array();
+
+
+	    $gift = array();
+	    $oneGoods = array();
+	    foreach ($advanceGoods as $value) {
+			$gift = array();
+		    $gift['promotionTitle'] = $value['promotion_title'];
+
+		    foreach ($value['goods_list'] as $single) {
+			    $oneGoods['id'] = $single['product_skn'];
+			    $oneGoods['name'] = $single['product_name'];
+			    $oneGoods['thumb'] = !empty($single['goods_images']) ? Images::getImageUrl($single['goods_images'], 120, 120) : '';
+			    $oneGoods['appearDate'] = '12月'; // 目前app接口没有返回该数据
+			    $oneGoods['price'] = $single['last_price'];
+			    $oneGoods['marketPrice'] = $single['market_price'];
+			    $oneGoods['count'] = $single['storage_number'];
+
+			    $gift['goods'][] = $oneGoods;
+		    }
+
+		    $arr[] = $gift;
+	    }
+
+        return $arr;
+    }
+
+    /**
      * 订单状态，按订单支付类型和订单状态
      * @var array
      */

@@ -63,13 +63,13 @@ class CartModel
 
 			/* 普通购物车 */
 			if(isset($cart['ordinary_cart_data'])) {
-				$result['commonGoodsCount'] = count($cart['ordinary_cart_data']['goods_list']);
+				$result['commonGoodsCount'] = $cart['ordinary_cart_data']['shopping_cart_data']['goods_count'];
 				$result['commonCart'] = self::procCartData($cart['ordinary_cart_data']);
 			}
 
 			/* 预售购物车 */
 			if(isset($cart['advance_cart_data'])) {
-				$result['presellGoodsCount'] = count($cart['advance_cart_data']['goods_list']);
+				$result['presellGoodsCount'] = $cart['advance_cart_data']['shopping_cart_data']['goods_count'];
 				$result['preSellCart'] = self::procCartData($cart['advance_cart_data']);
 			}
 
@@ -583,31 +583,25 @@ class CartModel
 		$result = array();
 
 		$oneGoods = array();
-		// 购买的商品列表
-		foreach ($data['goods_list'] as $value) {
-			$oneGoods['id'] = $value['product_sku'];
-			$oneGoods['skn'] = $value['product_skn'];
-			$oneGoods['name'] = $value['product_name'];
-			$oneGoods['thumb'] = Images::getImageUrl($value['goods_images'], 120, 120);
-			$oneGoods['color'] = $value['color_name'];
-			$oneGoods['size'] = $value['size_name'];
-			$oneGoods['appearDate'] = '12月'; // 目前app接口没有返回该数据
-			$oneGoods['price'] = $value['real_price'];
-			$oneGoods['count'] = $value['buy_number'];
-			$oneGoods['lowStocks'] = true;
-
-			$result['goods'][] = $oneGoods;
-		}
+		// 购买的可用商品列表
+		$validGoods = Helpers::formatCartGoods($data['goods_list']);
+		!empty($validGoods) && $result['goods'] = $validGoods;
+
+		// 失效商品列表
+		$notValidGoods = Helpers::formatCartGoods($data['sold_out_goods_list']);
+		!empty($notValidGoods) && $result['$notValidGoods'] = $notValidGoods;
+
 		// 赠品
 		(count($data['gift_list']) || count($data['price_gift'])) && $result['freebieOrAdvanceBuy'] = true;
 		$result['freebie'] = $data['gift_list'];
 		// 加价购
-		$result['advanceBuy'] = $data['price_gift'];
+		$result['advanceBuy'] = Helpers::formatAdvanceGoods($data['price_gift']);
 		// 结算数据
 		$result['price'] = $data['shopping_cart_data']['order_amount'];
 		$result['activityPrice'] = $data['shopping_cart_data']['discount_amount'];
 		$result['count'] = $data['shopping_cart_data']['goods_count'];
 		$result['sumPrice'] = $data['shopping_cart_data']['order_amount'];
+		print_r($result);
 
 		return $result;
 	}