内核更新，多余文件清理

application/user/controller/Order.php

@@ -51,20 +51,27 @@ class Order extends User{
 		if (!$order_id) {
 			$price_count = '0.00';
 			$list = $this->cart->all();
-			foreach ($list as $key => $value) {
-				$price_count += $value['price_count'];
+			if ($list) {
+				foreach ($list as $key => $value) {
+					$price_count += $value['price_count'];
+				}
+
+				$data = array(
+					'list'   => $list,
+					'price_count' => $price_count
+				);
+
+				//生成订单
+				$map['id'] = $this->order->createOrder($data);
 			}
-
-			$data = array(
-				'list'   => $list,
-				'price_count' => $price_count
-			);
-
-			//生成订单
-			$map['id'] = $this->order->createOrder($data);
 		}else{
 			$map['id'] = $order_id;
 		}
+
+		if (!isset($map['id'])) {
+			return $this->error('非法操作！');
+		}
+
 		$order = $this->order->where($map)->find();
 
 		$data = array(

application/user/controller/Profile.php

@@ -24,8 +24,13 @@ class Profile extends User{
 			}
 		}else{
 			$group['基础资料'] = $user->useredit;
+			$group['扩展信息'] = $user->userextend;
 
-			$info = $user->getInfo(session('user_auth.uid'));
+			$info = $user->where(array('uid'=>session('user_auth.uid')))->find();
+
+			if ($info->extend) {
+				$info = array_merge($info->toArray(), $info->extend->toArray());
+			}
 			$data = array(
 				'fieldGroup' => $group,
 				'info'       => $info