修复库存不足标记显示的bug；失效商品不显示库存不足

Code Review By Rock Zhang

@@ -23,15 +23,15 @@ class Yohobuy
 //     const SERVICE_URL = 'http://service.api.yohobuy.com/';
 //     const SERVICE_URL = 'http://service.api.yohobuy.com/';
 //     const YOHOBUY_URL = 'http://www.yohobuy.com/';
 //     const YOHOBUY_URL = 'http://www.yohobuy.com/';
 
 
-    const API_URL = 'http://apih5.yoho.cn/';
-    const API_URL2 = 'http://apih5.yoho.cn/';
-    const SERVICE_URL = 'http://serviceh5.yoho.cn/';
-    const YOHOBUY_URL = 'http://www.yohobuy.com/';
+//    const API_URL = 'http://apih5.yoho.cn/';
+//    const API_URL2 = 'http://apih5.yoho.cn/';
+//    const SERVICE_URL = 'http://serviceh5.yoho.cn/';
+//    const YOHOBUY_URL = 'http://www.yohobuy.com/';
 
 
 //    /* 测试环境 */
 //    /* 测试环境 */
-//    const API_URL = 'http://testapi.yoho.cn:28078/';
-//    const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
-//    const YOHOBUY_URL = 'http://www.yohobuy.com/';
+    const API_URL = 'http://testapi.yoho.cn:28078/';
+    const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
+    const YOHOBUY_URL = 'http://www.yohobuy.com/';
 
 
     /**
     /**
      * 私钥列表
      * 私钥列表

@@ -560,9 +560,10 @@ class Helpers
      * 格式化购物车商品
      * 格式化购物车商品
      *
      *
      * @param array $cartGoods 购物车商品列表
      * @param array $cartGoods 购物车商品列表
+     * @param boolean $isValid 是否是可用商品（非失效商品），默认是
      * @return array 处理之后的购物车商品数据
      * @return array 处理之后的购物车商品数据
      */
      */
-    public static function formatCartGoods($cartGoods)
+    public static function formatCartGoods($cartGoods, $isValid = true)
     {
     {
         $arr = array();
         $arr = array();
 
 
@@ -577,7 +578,11 @@ class Helpers
             $oneGoods['isSelected'] = $value['selected'] === 'Y';
             $oneGoods['isSelected'] = $value['selected'] === 'Y';
 			$oneGoods['price'] = self::transPrice($value['sales_price']);
 			$oneGoods['price'] = self::transPrice($value['sales_price']);
 			$oneGoods['count'] = $value['buy_number'];
 			$oneGoods['count'] = $value['buy_number'];
-			$oneGoods['lowStocks'] = ($value['buy_number'] < $value['storage_number']);
+
+            if ($isValid) {
+                $oneGoods['lowStocks'] = ($value['buy_number'] > $value['storage_number']);
+            }
+
 		    //gift=>是否赠品,advanceBuy=>是否加价购,soldOut=>失效商品;
 		    //gift=>是否赠品,advanceBuy=>是否加价购,soldOut=>失效商品;
 		    if (!isset($value['goods_type'])) {
 		    if (!isset($value['goods_type'])) {
 			    $oneGoods['isSoldOut'] = true;
 			    $oneGoods['isSoldOut'] = true;

@@ -739,7 +739,7 @@ class CartModel
             }
             }
 
 
             // 失效商品列表
             // 失效商品列表
-            $notValidGoods = Helpers::formatCartGoods($data['sold_out_goods_list']);
+            $notValidGoods = Helpers::formatCartGoods($data['sold_out_goods_list'], false);
             if (!empty($notValidGoods)) {
             if (!empty($notValidGoods)) {
                 $result['notValidGoods'] = $notValidGoods;
                 $result['notValidGoods'] = $notValidGoods;
             }
             }