添加购物车结算页面修改属性时重新运算的路由接口

Code Review By Rock Zhang

@@ -161,6 +161,30 @@ class ShoppingCartController extends AbstractAction
 	}
 	}
 
 
 	/**
 	/**
+	 * 购物车选择改变字段，重新运算订单数据
+	 */
+	public function orderComputeAction()
+	{
+		$result = array();
+
+		if ($this->isAjax()) {
+			$cartType = $this->post('cartType', 'ordinary');
+			$deliveryWay = $this->post('deliveryWay', 1);
+			$paymentType = $this->post('paymentType', 1);
+			$couponCode = $this->post('paymentType', null);
+			$yohoCoin = $this->post('paymentType', null);
+			$uid = $this->getUid(true);
+			$result = CartModel::orderCompute($uid, $cartType, $deliveryWay, $paymentType, $couponCode, $yohoCoin);
+		}
+
+		if (empty($result)) {
+			echo ' ';
+		} else {
+			$this->echoJson($result);
+		}
+	}
+
+	/**
 	 * 购物车输入优惠券码使用优惠券
 	 * 购物车输入优惠券码使用优惠券
 	 */
 	 */
 	public function couponSearchAction()
 	public function couponSearchAction()

@@ -390,11 +390,11 @@ class CartModel
 				$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'];
 				$salePrice = isset($orderCompute['discount_amount']) ? $orderCompute['discount_amount'] : $payReturn['shopping_cart_data']['discount_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'];
-				$freight = isset($orderCompute['promotion_formula_list']['promotion_amount']) ? $orderCompute['promotion_formula_list']['promotion_amount'] : $payReturn['shopping_cart_data']['promotion_formula_list']['promotion_amount'];
+				$freight = isset($orderCompute['promotion_formula_list']['promotion_amount']) ? $orderCompute['promotion_formula_list']['promotion_amount'] : $payReturn['shopping_cart_data']['promotion_formula_list'][1]['promotion_amount'];
 				$result['sumPrice'] = Helpers::transPrice($sumPrice);
 				$result['sumPrice'] = Helpers::transPrice($sumPrice);
 				$result['salePrice'] = Helpers::transPrice($salePrice);
 				$result['salePrice'] = Helpers::transPrice($salePrice);
 				$result['price'] = Helpers::transPrice($price);
 				$result['price'] = Helpers::transPrice($price);
-				$result['freight'] = strtr($freight, '￥', '') . '.00';
+				$result['freight'] = strtr($freight, array('￥'=>'','¥'=>'')) . '.00';
 			}
 			}
 
 
 			// 发票有关数据
 			// 发票有关数据