Merge branch 'goods' of 121.43.114.153:/home/git/repositories/shopnc into goods

mobile/control/member_cart.php

@@ -92,7 +92,7 @@ class member_cartControl extends mbMemberControl
         $goods_id = intval($_POST['goods_id']);
         $quantity = intval($_POST['quantity']);
         if ($goods_id <= 0 || $quantity <= 0) {
-            return joutput_error(errcode::ErrCart, '参数错误');
+            return joutput_error(errcode::ErrInputParam);
         }
 
         $model_goods = Model('goods');
@@ -103,7 +103,7 @@ class member_cartControl extends mbMemberControl
 
         //验证是否可以购买
         if (empty($goods_info)) {
-            return joutput_error(errcode::ErrCart, '商品已下架或不存在');
+            return joutput_error(errcode::ErrGoodsOff, '商品已下架或不存在');
         }
 
         //抢购
@@ -113,10 +113,10 @@ class member_cartControl extends mbMemberControl
         $logic_buy_1->getXianshiInfo($goods_info, $quantity);
 
         if ($goods_info['store_id'] == $this->member_info['store_id']) {
-            return joutput_error(errcode::ErrCart, '不能购买自己发布的商品');
+            return joutput_error(errcode::ErrCanNotBuyOwn);
         }
         if (intval($goods_info['goods_storage']) < 1 || intval($goods_info['goods_storage']) < $quantity) {
-            return joutput_error(errcode::ErrCart, '库存不足');
+            return joutput_error(errcode::ErrStorageShort);
         }
 
         $param = array();
@@ -132,7 +132,7 @@ class member_cartControl extends mbMemberControl
         if ($result) {
             joutput_data(array('result' => '1'));
         } else {
-            return joutput_error(errcode::ErrCart, '添加购物车失败！');
+            return joutput_error(errcode::ErrAddCart);
         }
     }
 

mobile/util/errcode.php

@@ -22,7 +22,13 @@ class errcode extends SplEnum
     const ErrMobileNotBinded = 10011;
 
     const ErrSpecial = 10100;
+
+    // 购物车模块（10200-10299）
     const ErrCart = 10200;
+    const ErrGoodsOff = 10201;
+    const ErrCanNotBuyOwn = 10202;
+    const ErrStorageShort = 10203;
+    const ErrAddCart = 10204;
 
     // 订单错误内容
     const ErrOrder = 10300;
@@ -100,6 +106,15 @@ class errcode extends SplEnum
             case errcode::ErrExpress:
                 return '查询快递出错';
 
+            case errcode::ErrGoodsOff:
+                return '商品下架';
+            case errcode::ErrCanNotBuyOwn:
+                return '不能购买自己商品';
+            case errcode::ErrStorageShort:
+                return '商品库存不足';
+            case errcode::ErrAddCart:
+                return '添加购物车失败';
+
             case errcode::ErrDB :
                 return 'ErrorDB';
             case errcode::ErrSms :