Merge branch 'test' of git.oschina.net:yiguanjia/php into test

www/protected/modules/moonclub/controllers/UserController.php

@@ -127,6 +127,11 @@ class  UserController extends MoonClubBaseController{
             $data[$i++]['foods'] = Foods::model()->parse($tmp);
         }
         $rows = array();
+
+        foreach ($row as $k => $v) {
+            $package = PackageProduct::get(new MongoId($v['package_id']));
+            $row[$k]['package_name'] = $package->package_name;
+        }
         $rows['xyh_orders'] = $row;
         $rows['service_info'] = $data;
         CommonFn::requestAjax(true, '成功',$rows);exit;