i

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

@@ -2,11 +2,11 @@
 /**
  * UserController o2o用户相关接口
  *
- *  
+ *
  *
  */
 class  UserController extends MoonClubBaseController{
-    
+
     public function actionInfo(){
         $user_id = Yii::app()->getRequest()->getParam("user_id");
 
@@ -88,14 +88,48 @@ class  UserController extends MoonClubBaseController{
     public function actionXOrderByUserId()
     {
         $user_id = Yii::app()->request->getParam('user_id','');
-        if (empty($user_id)) {
-            CommonFn::requestAjax(false, CommonFn::getMessage('message', 'mobile_not_exits'));exit;
+        if (!CommonFn::isMongoId($user_id)) {
+            CommonFn::requestAjax(false, CommonFn::getMessage('message', 'id_not_exits'));exit;
         }
         $criteria = new EMongoCriteria();
-        $criteria->user_id('==',$user_id);
+        $criteria->user_id('==',new MongoId($user_id));
         $userInfos = XyhOrder::model()->findAll($criteria);
         $row = CommonFn::getRowsFromCursor($userInfos);
-        CommonFn::requestAjax(true, '成功',$row);exit;
+        $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();
+        $rows['xyh_orders'] = $row;
+        $rows['service_info'] = $data;
+        CommonFn::requestAjax(true, '成功',$rows);exit;
 
     }
 

www/protected/modules/moonclub/models/Docters.php

@@ -19,6 +19,12 @@ class Docters extends MongoAr{
     public $employe_id;//employe_id
     public $remarks;// 备注
 
+
+    public static $station_option = array(
+        0 => '未预约',
+        1 => '已预约',
+        2 => '已诊脉',
+    );
     public function __construct($scenario='insert'){
         $this->setMongoDBComponent(Yii::app()->getComponent('mongodb_o2o'));
         parent::__construct($scenario);
@@ -59,7 +65,7 @@ class Docters extends MongoAr{
         $newRow['report_time'] = CommonFn::get_val_if_isset($row,'report_time','');
         $newRow['remarks'] = CommonFn::get_val_if_isset($row,'remarks','');
         $newRow['employe_id'] = CommonFn::get_val_if_isset($row,'employe_id','');
-
+        $newRow['status_str'] = Docters::$station_option[intval($newRow['status'])];
         if(APPLICATION=='admin'){
             $newRow['action_user'] = CommonFn::get_val_if_isset($row,'action_user',"");
             $newRow['action_time'] = CommonFn::get_val_if_isset($row,'action_time',"");

www/protected/modules/moonclub/models/Foods.php

@@ -17,6 +17,11 @@ class Foods extends MongoAr{
     public $end_time;// 结束日期
     public $remarks;// 备注
     public $employe_id;
+    public static $station_option = array(
+        0 => '未预约',
+        1 => '服务中',
+        2 => '已结束',
+    );
 
     public function __construct($scenario='insert'){
         $this->setMongoDBComponent(Yii::app()->getComponent('mongodb_o2o'));
@@ -57,6 +62,7 @@ class Foods extends MongoAr{
         $newRow['end_time'] = CommonFn::get_val_if_isset($row,'end_time','');
         $newRow['remarks'] = CommonFn::get_val_if_isset($row,'remarks','');
         $newRow['employe_id'] = CommonFn::get_val_if_isset($row,'employe_id','');
+        $newRow['status_str'] = Docters::$station_option[intval($newRow['status'])];
         if(APPLICATION=='admin'){
             $newRow['action_user'] = CommonFn::get_val_if_isset($row,'action_user',"");
             $newRow['action_time'] = CommonFn::get_val_if_isset($row,'action_time',"");

www/protected/modules/moonclub/models/NutritiousMeals.php

@@ -17,7 +17,11 @@ class NutritiousMeals extends MongoAr{
     public $end_time;// 确认日期
     public $remarks;// 备注
     public $employe_id;
-
+    public static $station_option = array(
+        0 => '未预约',
+        1 => '已预约',
+        2 => '已确认',
+    );
     public function __construct($scenario='insert'){
         $this->setMongoDBComponent(Yii::app()->getComponent('mongodb_o2o'));
         parent::__construct($scenario);
@@ -57,6 +61,7 @@ class NutritiousMeals extends MongoAr{
         $newRow['end_time'] = CommonFn::get_val_if_isset($row,'end_time','');
         $newRow['remarks'] = CommonFn::get_val_if_isset($row,'remarks','');
         $newRow['employe_id'] = CommonFn::get_val_if_isset($row,'employe_id','');
+        $newRow['status_str'] = Docters::$station_option[intval($newRow['status'])];
         if(APPLICATION=='admin'){
             $newRow['action_user'] = CommonFn::get_val_if_isset($row,'action_user',"");
             $newRow['action_time'] = CommonFn::get_val_if_isset($row,'action_time',"");

www/protected/modules/moonclub/models/Prolactins.php

@@ -17,6 +17,11 @@ class Prolactins extends MongoAr{
     public $end_time;// 催乳日期
     public $remarks;// 备注
     public $employe_id;
+    public static $station_option = array(
+        0 => '未预约',
+        1 => '已预约',
+        2 => '已服务',
+    );
 
     public function __construct($scenario='insert'){
         $this->setMongoDBComponent(Yii::app()->getComponent('mongodb_o2o'));
@@ -57,6 +62,8 @@ class Prolactins extends MongoAr{
         $newRow['end_time'] = CommonFn::get_val_if_isset($row,'end_time','');
         $newRow['remarks'] = CommonFn::get_val_if_isset($row,'remarks','');
         $newRow['employe_id'] = CommonFn::get_val_if_isset($row,'employe_id','');
+        $newRow['status_str'] = Docters::$station_option[intval($newRow['status'])];
+
         if(APPLICATION=='admin'){
             $newRow['action_user'] = CommonFn::get_val_if_isset($row,'action_user',"");
             $newRow['action_time'] = CommonFn::get_val_if_isset($row,'action_time',"");

www/protected/modules/moonclub/models/Techs.php

@@ -17,7 +17,11 @@ class Techs extends MongoAr{
     public $end_time;// 保洁日期
     public $remarks;// 备注
     public $employe_id;
-
+    public static $station_option = array(
+        0 => '未预约',
+        1 => '已预约',
+        2 => '已保洁',
+    );
     public function __construct($scenario='insert'){
         $this->setMongoDBComponent(Yii::app()->getComponent('mongodb_o2o'));
         parent::__construct($scenario);
@@ -57,7 +61,7 @@ class Techs extends MongoAr{
         $newRow['end_time'] = CommonFn::get_val_if_isset($row,'end_time','');
         $newRow['remarks'] = CommonFn::get_val_if_isset($row,'remarks','');
         $newRow['employe_id'] = CommonFn::get_val_if_isset($row,'employe_id','');
-
+        $newRow['status_str'] = Docters::$station_option[intval($newRow['status'])];
         if(APPLICATION=='admin'){
             $newRow['action_user'] = CommonFn::get_val_if_isset($row,'action_user',"");
             $newRow['action_time'] = CommonFn::get_val_if_isset($row,'action_time',"");

www/protected/modules/moonclub/models/YsServices.php

@@ -17,7 +17,11 @@ class YsServices extends MongoAr{
     public $end_time;// 结束日期
     public $remarks;// 备注
     public $employe_id;
-
+    public static $station_option = array(
+        0 => '未预约',
+        1 => '服务中',
+        2 => '已结束',
+    );
     public function __construct($scenario='insert'){
         $this->setMongoDBComponent(Yii::app()->getComponent('mongodb_o2o'));
         parent::__construct($scenario);
@@ -57,6 +61,8 @@ class YsServices extends MongoAr{
         $newRow['end_time'] = CommonFn::get_val_if_isset($row,'end_time','');
         $newRow['remarks'] = CommonFn::get_val_if_isset($row,'remarks','');
         $newRow['employe_id'] = CommonFn::get_val_if_isset($row,'employe_id','');
+
+        $newRow['status_str'] = Docters::$station_option[intval($newRow['status'])];
         if(APPLICATION=='admin'){
             $newRow['action_user'] = CommonFn::get_val_if_isset($row,'action_user',"");
             $newRow['action_time'] = CommonFn::get_val_if_isset($row,'action_time',"");