修复商品结算页商品价格错误的bug（更改价格计算方式）

Code Review By Rock Zhang

@@ -74,7 +74,7 @@
             {{> me/order/good}}
             {{/each}}
     </section>
-    <div class="goods-num">共{{num}}件商品  合计<span>{{goodsPrice}}</span></div>
+    <div class="goods-num">共{{num}}件商品  合计<span>¥{{goodsPrice}}</span></div>
 
     <section class="block">
         <ul class="sale-invoice">

@@ -453,6 +453,8 @@ class CartModel
             // 订单商品
             if (isset($payReturn['goods_list'])) {
                 $oneGoods = array();
+                $goodsPrice = 0;
+
                 foreach ($payReturn['goods_list'] as $single) {
                     $oneGoods = array();
                     $oneGoods['id'] = $single['product_sku']; // TODO 未确定用哪个
@@ -460,8 +462,8 @@ class CartModel
                     $oneGoods['name'] = $single['product_name'];
                     $oneGoods['color'] = $single['color_name'];
                     $oneGoods['size'] = $single['size_name'];
-                    $oneGoods['price'] = Helpers::transPrice($single['last_price']);
                     $oneGoods['count'] = $single['buy_number'];
+                    $oneGoods['price'] = Helpers::transPrice($single['last_price']);
 
                     //gift=>是否赠品,advanceBuy=>是否加价购;
                     if ($single['goods_type'] == 'gift' && !isset($single['isAdvanceBuy'])) {
@@ -472,8 +474,14 @@ class CartModel
                         $oneGoods['price'] = Helpers::transPrice($single['sale_price']);
                     }
 
+                    // 累加商品金额
+                    $goodsPrice += $single['subtotal'];
+
                     $result['goods'][] = $oneGoods;
                 }
+
+                // 商品金额
+                $result['goodsPrice'] = Helpers::transPrice($goodsPrice);
             }
 
             // 支付方式
@@ -514,7 +522,7 @@ class CartModel
                 // 订单商品数
                 $result['num'] = $payReturn['shopping_cart_data']['selected_goods_count'];
                 // 商品金额
-                $result['goodsPrice'] = $payReturn['shopping_cart_data']['str_order_amount'];
+//                $result['goodsPrice'] = $payReturn['shopping_cart_data']['str_order_amount'];
             }
 
             // 发票有关数据