修复商品总价错误的bug

@@ -769,12 +769,27 @@ class CartModel
                 $result['advanceBuy'] = Helpers::formatAdvanceGoods($data['price_gift'], $result['advanceBuyCount']);
             }
 
+            // 已参加的活动
+            if (!empty($data['promotion_info'])) {
+                $result['promotionInfo'] = array();
+                $info = array();
+                foreach ($data['promotion_info'] as $val) {
+                    $info = array();
+                    $info['id'] = $val['promotion_id'];
+                    $info['name'] = $val['promotion_title'];
+
+                    $result['promotionInfo'][] = $info;
+                }
+
+                $result['promotionFormula'] = $data['shopping_cart_data']['promotion_formula'];
+            }
+
             // 结算数据
             $result['price'] = Helpers::transPrice($data['shopping_cart_data']['order_amount']);
             $result['activityPrice'] = Helpers::transPrice($data['shopping_cart_data']['discount_amount']);
             $result['count'] = $data['shopping_cart_data']['selected_goods_count'];
             $result['isAllSelected'] = ($data['shopping_cart_data']['goods_count'] === $data['shopping_cart_data']['selected_goods_count']) && ($data['shopping_cart_data']['selected_goods_count'] >0);
-            $result['sumPrice'] = Helpers::transPrice($data['shopping_cart_data']['order_amount']);
+            $result['sumPrice'] = Helpers::transPrice($data['shopping_cart_data']['last_order_amount']);
         }while(0);
 
         return $result;