移动购物车的目录结构

Code Review By Rock Zhang

--Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2
++Subproject commit e9d066dd88a8e7e37103021c427a205a5cfcdcec

@@ -482,9 +482,16 @@ class CartModel
             // 订单数据
             // 订单数据
             if (isset($payReturn['shopping_cart_data']) && !empty($payReturn['shopping_cart_data'])) {
             if (isset($payReturn['shopping_cart_data']) && !empty($payReturn['shopping_cart_data'])) {
                 $sumPrice = isset($orderCompute['order_amount']) ? $orderCompute['order_amount'] : $payReturn['shopping_cart_data']['order_amount'];
                 $sumPrice = isset($orderCompute['order_amount']) ? $orderCompute['order_amount'] : $payReturn['shopping_cart_data']['order_amount'];
-                $freight = isset($orderCompute['promotion_formula_list']['promotion_amount']) ? $orderCompute['promotion_formula_list'][1]['promotion_amount'] : $payReturn['shopping_cart_data']['promotion_formula_list'][1]['promotion_amount'];
+
+                $freight = '¥0';
+                if (isset($orderCompute['promotion_formula_list'][1]['promotion_amount'])) {
+                    $freight = $orderCompute['promotion_formula_list'][1]['promotion_amount'];
+                } elseif(isset($payReturn['shopping_cart_data']['promotion_formula_list'][1]['promotion_amount'])) {
+                    $freight = $payReturn['shopping_cart_data']['promotion_formula_list'][1]['promotion_amount'];
+                }
+
                 $couponPrice = isset($orderCompute['coupon_amount']) ? $orderCompute['coupon_amount'] : false;
                 $couponPrice = isset($orderCompute['coupon_amount']) ? $orderCompute['coupon_amount'] : false;
-                $salePrice = isset($orderCompute['discount_amount']) ? $orderCompute['discount_amount'] : $payReturn['shopping_cart_data']['promotion_formula_list'][3]['promotion_amount'];
+                $salePrice = isset($orderCompute['discount_amount']) ? $orderCompute['discount_amount'] : $payReturn['shopping_cart_data']['discount_amount'];
                 $price = isset($orderCompute['last_order_amount']) ? $orderCompute['last_order_amount'] : $payReturn['shopping_cart_data']['last_order_amount'];
                 $price = isset($orderCompute['last_order_amount']) ? $orderCompute['last_order_amount'] : $payReturn['shopping_cart_data']['last_order_amount'];
                 $result['sumPrice'] = Helpers::transPrice($sumPrice);
                 $result['sumPrice'] = Helpers::transPrice($sumPrice);
                 $result['salePrice'] = Helpers::transPrice($salePrice);
                 $result['salePrice'] = Helpers::transPrice($salePrice);

@@ -211,6 +211,30 @@ class IndexController extends AbstractAction
     }
     }
 
 
     /**
     /**
+     * 修改购物车商品数量
+     */
+    public function modifyNumAction()
+    {
+        $result = array();
+
+        if ($this->isAjax()) {
+            $shoppingKey = $this->getSession('shoppingKey');
+            $uid = $this->getUid(true);
+
+            $sku= $this->post('sku', 0);
+            $increaseNum = $this->post('increaseNum', null);
+            $decreaseNum = $this->post('decreaseNum', null);
+            $result = CartModel::modifyProductNum($uid, $sku, $increaseNum, $decreaseNum, $shoppingKey);
+        }
+
+        if (empty($result)) {
+            echo ' ';
+        } else {
+            $this->echoJson($result);
+        }
+    }
+
+    /**
      * 修改购物车商品数据
      * 修改购物车商品数据
      */
      */
     public function modifyAction()
     public function modifyAction()