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

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

@@ -95,37 +95,7 @@ class  UserController extends MoonClubBaseController{
         $criteria->user_id('==',new MongoId($user_id));
         $userInfos = XyhOrder::model()->findAll($criteria);
         $row = CommonFn::getRowsFromCursor($userInfos);
-        $i = 0;
-        $data = array();
-        foreach ($userInfos as $key => $value) {
-            $criteria = new EMongoCriteria();
-            $criteria->xyh_order_id('==',(string)$value->_id);
-
-            $tmp = Docters::model()->findAll($criteria);
-            $tmp = CommonFn::getRowsFromCursor($tmp);
-            $data[$i]['docters'] = Docters::model()->parse($tmp);
-
-            $tmp = NutritiousMeals::model()->findAll($criteria);
-            $tmp = CommonFn::getRowsFromCursor($tmp);
-            $data[$i]['nutritiousMeals'] = NutritiousMeals::model()->parse($tmp);
-
-
-            $tmp = Techs::model()->findAll($criteria);
-            $tmp = CommonFn::getRowsFromCursor($tmp);
-            $data[$i]['techs'] = Techs::model()->parse($tmp);
 
-            $tmp = YsServices::model()->findAll($criteria);
-            $tmp = CommonFn::getRowsFromCursor($tmp);
-            $data[$i]['ysServices'] = YsServices::model()->parse($tmp);
-
-            $tmp = Prolactins::model()->findAll($criteria);
-            $tmp = CommonFn::getRowsFromCursor($tmp);
-            $data[$i]['prolactins'] = Prolactins::model()->parse($tmp);
-
-            $tmp = Foods::model()->findAll($criteria);
-            $tmp = CommonFn::getRowsFromCursor($tmp);
-            $data[$i++]['foods'] = Foods::model()->parse($tmp);
-        }
         $rows = array();
 
         foreach ($row as $k => $v) {
@@ -133,10 +103,45 @@ class  UserController extends MoonClubBaseController{
             $row[$k]['package_name'] = $package->package_name;
         }
         $rows['xyh_orders'] = $row;
-        $rows['service_info'] = $data;
+        //$rows['service_info'] = $data;
         CommonFn::requestAjax(true, '成功',$rows);exit;
 
     }
+    public function actionGetServiceByXOrderId()
+    {
+        $_id = Yii::app()->request->getParam('_id','');
+        if (!CommonFn::isMongoId($_id)) {
+            CommonFn::requestAjax(false, CommonFn::getMessage('message', 'id_not_exits'));exit;
+        }
+        $criteria = new EMongoCriteria();
+        $criteria->xyh_order_id('==',(string)$_id);
+
+        $tmp = Docters::model()->findAll($criteria);
+        $tmp = CommonFn::getRowsFromCursor($tmp);
+        $data['docters'] = Docters::model()->parse($tmp);
+
+        $tmp = NutritiousMeals::model()->findAll($criteria);
+        $tmp = CommonFn::getRowsFromCursor($tmp);
+        $data['nutritiousMeals'] = NutritiousMeals::model()->parse($tmp);
+
+
+        $tmp = Techs::model()->findAll($criteria);
+        $tmp = CommonFn::getRowsFromCursor($tmp);
+        $data['techs'] = Techs::model()->parse($tmp);
+
+        $tmp = YsServices::model()->findAll($criteria);
+        $tmp = CommonFn::getRowsFromCursor($tmp);
+        $data['ysServices'] = YsServices::model()->parse($tmp);
+
+        $tmp = Prolactins::model()->findAll($criteria);
+        $tmp = CommonFn::getRowsFromCursor($tmp);
+        $data['prolactins'] = Prolactins::model()->parse($tmp);
+
+        $tmp = Foods::model()->findAll($criteria);
+        $tmp = CommonFn::getRowsFromCursor($tmp);
+        $data['foods'] = Foods::model()->parse($tmp);
+        CommonFn::requestAjax(true, '成功',$data);exit;
+    }