Charlie 8 years ago
parent
commit
e2a8bf6b37

+ 1 - 1
www/protected/commands/GiveCouponsCommand.php

@@ -43,7 +43,7 @@ class GiveCouponsCommand extends CConsoleCommand{
                         if(isset($address['mobile'])){
                             $status = $cache->get('sendsms_'.$address['mobile']);
                             if(!$status){
-                                $sms_data['tpl'] = '【壹管家宠物】送你60元代金券,可用于全部上门服务,下单立减→http://t.cn/ 回T退订';
+                                $sms_data['tpl'] = '【壹管家】送你60元代金券,可用于全部上门服务,下单立减→http://t.cn/ 回T退订';
                                 $sms_data['mobile'] = $address['mobile'];
                                 $list = new ARedisList('send_sms_list');
                                 $list->push(json_encode($sms_data));

+ 0 - 214
www/protected/commands/PushRemindCommand.php

@@ -1,214 +0,0 @@
-<?php 
-/**
- * 推送宠物提醒脚本
- *
- * 从Redis队列中取出需要推送的提醒
- * Redis队列的Key为:`remind_list_` + 今天的日期时间戳
- *
- * 队列中的数据格式:
- * $item = [
- *     'remind_id'   => '提醒ID',
- *     'user_id'     => '用户ID',
- *     'pet_name'    => '宠物名字',
- *     'remind_days' => '提前提醒的天数',
- *     'remind_type' => '提醒类型',
- * ];
- */
-class PushRemindCommand extends CConsoleCommand{
-
-    public function run() {
-        $redis_key = 'remind_list_' . strtotime('today');
-        $redis = new Redis();
-        $redis->connect(Yii::app()->redis->hostname, Yii::app()->redis->port);
-        while (1) {
-            $cache_data = $redis->brpop($redis_key, 5);
-            if (isset($cache_data[1])) {
-                $data = json_decode($cache_data[1], true);
-            } else {
-                continue;
-            }
-            if (!$data) {
-                break;
-            }
-
-            // 文案
-            $remind_types = self::$dog_remind_types;
-            if (!$data['remind_days']) {
-                $remind_copy = $data['pet_name'] . '今天要' . $remind_types[$data['remind_type']]['shorthand'] . '了哦';
-            } else {
-                $remind_copy = '距离' . $data['pet_name'] . '下一次' . $remind_types[$data['remind_type']]['shorthand'] . '天哦';
-            }
-
-            // 推送消息
-            $z_action_cat = new ZActionCat();
-            $news = $z_action_cat->getUnReadNews(new MongoId($data['user_id']));
-            $push = Service::factory('PushService');
-            $push_content = [
-                'title'     => $remind_copy,
-                'content'   => $remind_copy,
-                'news'      => $news,
-                'type'      => 'remind',
-                'data'      => [],
-            ];
-            $template = $push->TransmissionTemplate([
-                'transmissionType' => 2, 'alert' => $remind_copy, 'transmissionContent' => $push_content, 'payload' => []
-            ]);
-            $push->pushMessageToSingle($template, $data['user_id']);
-        }
-    }
-
-    public static $dog_remind_types = [
-        // 第一针疫苗
-        'first_immunity' => [
-            'title' => '第一针疫苗',
-            'shorthand' => '免疫',
-            'desc' => [
-                '出生后45天,注射第一针',
-            ],
-            'project_type' => 1,
-            'remind_cycle' => '',
-        ],
-        // 第二针疫苗
-        'second_immunity' => [
-            'title' => '第二针疫苗',
-            'shorthand' => '免疫',
-            'desc' => [
-                '与上一针间隔21天'
-            ],
-            'project_type' => 1,
-            'remind_cycle' => '',
-        ],
-        // 第三针疫苗+狂犬疫苗
-        'third_immunity' => [
-            'title' => '第三针疫苗+狂犬疫苗',
-            'shorthand' => '免疫',
-            'desc' => [
-                '与上一针间隔21天'
-            ],
-            'project_type' => 1,
-            'remind_cycle' => '',
-        ],
-        // 补充疫苗+狂犬疫苗
-        'other_immunity' => [
-            'title' => '补充疫苗+狂犬疫苗',
-            'shorthand' => '免疫',
-            'desc' => [
-                '每年注射一次',
-            ],
-            'project_type' => 2,
-            'remind_cycle' => '1 year',
-        ],
-        // 体内驱虫
-        'inside_deworming' => [
-            'title' => '体内驱虫',
-            'shorthand' => '体内驱虫',
-            'desc' => [
-                '1月龄以下的狗狗,需资讯医生使用驱虫药;',
-                '1月龄以上6月龄以下的狗狗,每隔一个月驱虫一次;',
-                '6月龄以上的狗狗,每隔三个月驱虫一次',
-            ],
-            'project_type' => 2,
-            'remind_cycle' => '3 month',
-        ],
-        // 体外驱虫
-        'outside_deworming' => [
-            'title' => '体外驱虫',
-            'shorthand' => '体外驱虫',
-            'desc' => [
-                '6周龄以下或者体重少于1公斤的狗狗,需咨询医生使用体外驱虫药;',
-                '6周龄以上的狗狗,每隔一个月驱虫一次。',
-            ],
-            'project_type' => 2,
-            'remind_cycle' => '1 month',
-        ],
-        // 体检
-        'physical_examination' => [
-            'title' => '体检',
-            'shorthand' => '体检',
-            'desc' => [
-                '宠物体检一般一年一次即可;',
-                '应将宠物送到正规专业的动物医院进行体检。',
-            ],
-            'project_type' => 2,
-            'remind_cycle' => '1 year',
-        ],
-        // 洗澡
-        'shower' => [
-            'title' => '洗澡',
-            'shorthand' => '洗澡',
-            'desc' => [
-                '冬天一般每15天一次,夏天一般每8天一次;',
-                '在空气湿度大或阴雨天时,应延期洗澡为宜。',
-            ],
-            'project_type' => 2,
-            'remind_cycle' => '8 day',
-        ],
-        // 剪指甲
-        'shear_nails' => [
-            'title' => '剪指甲',
-            'shorthand' => '剪指甲',
-            'desc' => [
-                '一般狗狗每隔7天修剪一次;',
-                '根据指甲长度速度,可适当延后。'
-            ],
-            'project_type' => 2,
-            'remind_cycle' => '1 week',
-        ],
-        // 剪毛
-        'shearing' => [
-            'title' => '剪毛',
-            'shorthand' => '剪毛',
-            'desc' => [
-                '视狗狗毛发生长程度而定,一般一个月修剪一次即可;',
-                '短毛狗可不需要剪毛或者相对减少剪毛次数。'
-            ],
-            'project_type' => 2,
-            'remind_cycle' => '1 month',
-        ],
-        // 刷牙
-        'brush_teeth' => [
-            'title' => '刷牙',
-            'shorthand' => '刷牙',
-            'desc' => [
-                '建议每7天至少帮狗狗刷一次牙;',
-                '因为牙刷的毛质较硬,在帮狗狗刷牙的时候切记不能用力,以免牙龈出血。'
-            ],
-            'project_type' => 2,
-            'remind_cycle' => '1 week',
-        ],
-        // 挤肛门腺
-        'anal_glands' => [
-            'title' => '挤肛门腺',
-            'shorthand' => '挤肛门腺',
-            'desc' => [
-                '挤肛门腺次数不用太频繁,15天一次即可;',
-                '定期检查肛门的液囊。',
-            ],
-            'project_type' => 2,
-            'remind_cycle' => '15 day',
-        ],
-        // 耳道清理
-        'ears_clean' => [
-            'title' => '耳道清理',
-            'shorthand' => '耳道清理',
-            'desc' => [
-                '建议每7天帮狗狗清理一次耳道;',
-                '拔除耳毛不可经常,间隔期十天至一个月。',
-            ],
-            'project_type' => 2,
-            'remind_cycle' => '1 week',
-        ],
-        // 清洁眼睛
-        'eyes_clean' => [
-            'title' => '清洁眼睛',
-            'shorthand' => '清洁眼睛',
-            'desc' => [
-                '建议7天至少帮狗狗清洁眼睛一次;',
-                '建议减少使用含类固醇的眼药水,用久了会容易导致青光眼,必须谨慎。'
-            ],
-            'project_type' => 2,
-            'remind_cycle' => '1 week',
-        ],
-    ];
-
-}

+ 3 - 3
www/protected/commands/SendSMSCommand.php

@@ -23,10 +23,10 @@ class SendSMSCommand extends CConsoleCommand{
             $user_info = explode("----", $value);
             if(preg_match("/\d{11}/", $user_info[1])){
                 $user_info[1] = trim($user_info[1]);
-                $result = $smsservice->send_sms('【壹管家宠物】炎热酷暑,清凉一夏,下载壹管家APP即获248元优惠大礼包,狗狗上门洗护仅10元起,有效期至6.30日,猛戳 http://dwz.cn,回T退订',$user_info[1]);
+                $result = $smsservice->send_sms('【壹管家】炎热酷暑,清凉一夏,下载壹管家APP即获248元优惠大礼包,猛戳 http://dwz.cn,回T退订',$user_info[1]);
                 if($i==1000){
-                    $result = $smsservice->send_sms('【壹管家宠物】炎热酷暑,清凉一夏,下载壹管家APP即获248元优惠大礼包,狗狗上门洗护仅10元起,有效期至6.30日,猛戳 http://dwz.cn,回T退订','18521093629');
-                    $result = $smsservice->send_sms('【壹管家宠物】炎热酷暑,清凉一夏,下载壹管家APP即获248元优惠大礼包,狗狗上门洗护仅10元起,有效期至6.30日,猛戳 http://dwz.cn,回T退订','18817554864');
+                    $result = $smsservice->send_sms('【壹管家】炎热酷暑,清凉一夏,下载壹管家APP即获248元优惠大礼包,回T退订','18521093629');
+                    $result = $smsservice->send_sms('【壹管家】炎热酷暑,清凉一夏,下载壹管家APP即获248元优惠大礼包,','18817554864');
                 }
                 echo $i++;
                 echo iconv('utf-8', 'gbk', $result);

+ 1 - 2
www/protected/components/CommonSMS.php

@@ -15,7 +15,7 @@ class CommonSMS{
                 break;
 
             case 'dianping_final_order'://点评订单完成后发送短信
-                Service::factory('SendSMSService')->send_sms('【壹管家宠物】亲,感谢使用壹管家宠物上门服务,下载壹管家APP:http://t.cn/R2DKttW  有价值328元的新手礼包哦!回T退订',$params['mobile']);
+                Service::factory('SendSMSService')->send_sms('【壹管家】亲,',$params['mobile']);
                 break;
 
             case 'final_order'://订单完成后发送短信
@@ -42,6 +42,5 @@ class CommonSMS{
     
 // 862005    
 
-// 【壹管家宠物】尊敬的#name#,本次服务已完成。已赠送您#num#个爪币,壹管家APP"首页"—>"发现"—>"礼物"中去兑换礼物吧。参与评价,还能获得20元优惠券哦。回T退订
 
 }

+ 2 - 2
www/protected/config/console.php

@@ -313,8 +313,8 @@ if(trim($env) == 'develop'){// 本地配置
                 'qiniuConfig' => array(
                     'ak'=>'Kn8GNMFOLKTNMUaKZ6r1wnjsgTk4ideQifK3umUr',
                     'sk'=>'mLtD4GhBjQt_llcgx4rKlhAts9j8iJ0Qa5VmNyi2',
-                    'icons'=>'icons',//后台可能上传一些图标    如宠物种类的图标    活动banner   圈子的图标
-                    'pics'=>'pics',//后台和app上  上传到帖子、回帖里面的图片
+                    'icons'=>'icons',//
+                    'pics'=>'pics',//
                     'avatars'=>'avatars',//用户的头像
                     'video'=>'video'//视频文件
                 )

+ 2 - 2
www/protected/config/develop.php

@@ -48,8 +48,8 @@ return CMap::mergeArray(
                     'qiniuConfig' => array(
                     'ak'=>'Kn8GNMFOLKTNMUaKZ6r1wnjsgTk4ideQifK3umUr',
                     'sk'=>'mLtD4GhBjQt_llcgx4rKlhAts9j8iJ0Qa5VmNyi2',
-                    'icons'=>'test',//后台可能上传一些图标    如宠物种类的图标    活动banner   圈子的图标
-                    'pics'=>'test',//后台和app上  上传到帖子、回帖里面的图片
+                    'icons'=>'test',
+                    'pics'=>'test',
                     'avatars'=>'test',//用户的头像
                     'video'=>'test'//音频文件
                 ),

+ 2 - 2
www/protected/config/main.php

@@ -113,8 +113,8 @@ return array(
             'qiniuConfig' => array(
                 'ak'=>'Kn8GNMFOLKTNMUaKZ6r1wnjsgTk4ideQifK3umUr',
                 'sk'=>'mLtD4GhBjQt_llcgx4rKlhAts9j8iJ0Qa5VmNyi2',
-                'icons'=>'icons',//后台可能上传一些图标    如宠物种类的图标    活动banner   圈子的图标
-                'pics'=>'pics',//后台和app上  上传到帖子、回帖里面的图片
+                'icons'=>'icons',
+                'pics'=>'pics',
                 'avatars'=>'avatars',//用户的头像
                 'video'=>'video'//音频文件
             )

+ 1 - 309
www/protected/modules/api/controllers/CommonController.php

@@ -10,247 +10,7 @@ class CommonController extends ApiBaseController {
         }
         return $this->verify();
     }
-    public function actionDiscover(){
-        $page = intval(Yii::app()->getRequest()->getParam("page",1));
-        $page = $page?$page:1;
-        $type = Yii::app()->request->getParam('type','');
-        $user_id = Yii::app()->request->getParam('user_id','');
-        $device_id = Yii::app()->request->getParam('device_id','');
-        if($type == 'digest'){
-            $city_info =  json_decode(Yii::app()->request->getParam('city_info'),true);
-            //防止city_info出现非法数据
-            if(!isset($city_info['province'])){
-                $city_info['province'] = '';
-                $city_info['city'] = '';
-                $city_info['area'] = '';
-            }elseif(!isset($city_info['city'])){
-                $city_info['city'] = '';
-                $city_info['area'] = '';
-            }elseif(!isset($city_info['area'])){
-                $city_info['area'] = '';
-            }
-            $z_User = new ZUser();
-            $user = $z_User->idExist($user_id);
-            $z_group = new ZGroup();
-            $res_topics = array();
-            $actiontime = CommonFn::getFirstTime(ActionTimeRedis::TYPE_GET_INDEX,$device_id,$page);
-            $_user = null;
-            if($user){
-                $_user = $user['_id'];
-            }
-            $picked_groups = $z_group->get_user_picked_groups($_user,$city_info,false,true);
-            $picked_groups = $z_group->filter_special($picked_groups);
-            $parsed_groups = array();
-            foreach($picked_groups as $picked_group){
-                $parsed_groups[] = new MongoId($picked_group['_id']);
-            }
-            $pagesize = Yii::app()->params['indexPageSize'];
-            $conditions = array(
-                                            'group'=>array('in',$parsed_groups),
-                                            'status'=>array('==',1),
-                                            'time'=>array('<=',$actiontime)
-                                        );
-            $order = array(
-                'time'=>'desc',
-            );
-            $model = new Topic();
-            $pagedata = CommonFn::getPagedata($model,$page,$pagesize,$conditions,$order,false,false);
-            $topics = $pagedata['res'];
-            foreach($topics as $topic){
-                $_topic = $model->parseRow($topic,array('id','content','city_info','time','time_str','group','visit_count','reply_count','fav_count','like_count','user','pics','voice','video','last_post_time','last_post_time_str'));
-                if($user){
-                    $z_like = new ZLike();
-                    $like = $z_like->getLikeByLikeObj((string)$user['_id'],$_topic['id']);
-                    if(empty($like)){
-                        $_topic['is_liked'] = false;
-                    }else{
-                        $_topic['is_liked'] = true;
-                    }
-                }else{
-                    $_topic['is_liked'] = false;
-                }
-                $res_topics[] = $_topic;
-            }
-            CommonFn::requestAjax(true,'',$res_topics,200,array('sum_count' => $pagedata['sum_count'],'sum_page'=>$pagedata['sum_page'],'page_size'=>$pagedata['page_size'],'current_page'=>$pagedata['current_page'])); 
-        }else{
-            
-        }
-
-    }
-
-    //推荐帖子
-    public function actionIndex(){
-        $page = intval(Yii::app()->getRequest()->getParam("page",1));
-        $city_info =  json_decode(Yii::app()->request->getParam('city_info'),true);
-        if(empty($page)){
-            $page = 1;
-        }
-        $user_id = Yii::app()->request->getParam('user_id','');
-        $device_id = Yii::app()->request->getParam('device_id','');
-        //防止city_info出现非法数据
-        if(!isset($city_info['province'])){
-            $city_info['province'] = '';
-            $city_info['city'] = '';
-            $city_info['area'] = '';
-        }elseif(!isset($city_info['city'])){
-            $city_info['city'] = '';
-            $city_info['area'] = '';
-        }elseif(!isset($city_info['area'])){
-            $city_info['area'] = '';
-        }
-        $z_User = new ZUser();
-        $user = $z_User->idExist($user_id);
-        $z_group = new ZGroup();
-        $z_topic = new ZTopic();
-        $arr = array();
-        $actiontime = CommonFn::getFirstTime(ActionTimeRedis::TYPE_GET_INDEX,$device_id,$page);
-        $_user = null;
-        if($user){
-            $_user = $user['_id'];
-        }
-        $picked_groups = $z_group->get_user_picked_groups($_user,$city_info,false,true);
-        $picked_groups = $z_group->filter_special($picked_groups);
-        $parsed_groups = array();
-        foreach($picked_groups as $picked_group){
-            $parsed_groups[] = new MongoId($picked_group['_id']);
-        }
-        $pagesize = Yii::app()->params['indexPageSize'];
-        $conditions = array(
-                                        'group'=>array('in',$parsed_groups),
-                                        'status'=>array('==',1),
-                                        'time'=>array('<=',$actiontime)
-                                    );
-        $order = array(
-            'time'=>'desc',
-        );
-        $model = new Topic();
-        $pagedata = CommonFn::getPagedata($model,$page,$pagesize,$conditions,$order,false,false);
-        $topics = $pagedata['res'];
-        $front_topic_user = '';
-        $last_topics = array();
-        foreach($topics as $topic){
-            $_topic = $model->parseRow($topic,array('id','content','city_info','time','time_str','group','visit_count','reply_count','fav_count','like_count','user','pics','voice','video','last_post_time','last_post_time_str'));
-            if($user){
-                $z_like = new ZLike();
-                $like = $z_like->getLikeByLikeObj((string)$user['_id'],$_topic['id']);
-                if(empty($like)){
-                    $_topic['is_liked'] = false;
-                }else{
-                    $_topic['is_liked'] = true;
-                }
-            }else{
-                $_topic['is_liked'] = false;
-            }
-            if($_topic['user']['id'] == $front_topic_user){
-                $last_topics[] = array('type'=>'topic','item'=>$_topic);
-            }else{
-                $front_topic_user = $_topic['user']['id'];
-                $arr[] = array('type'=>'topic','item'=>$_topic);
-            }
-        }
-        $arr = array_merge($arr,$last_topics);
-        CommonFn::requestAjax(true,'',$arr,200,array('sum_count' => $pagedata['sum_count'],'sum_page'=>$pagedata['sum_page'],'page_size'=>$pagedata['page_size'],'current_page'=>$pagedata['current_page'])); 
-    }
-
-    //首页轮播的图
-    public function actionSlide(){
-        $city_info =  json_decode(Yii::app()->request->getParam('city_info'),true);
-        $city_info_pro = isset($city_info['province'])?$city_info['province']:'';
-        $criteria = new EMongoCriteria();
-        $criteria->status('==', 1);
-        if(CommonFn::compareVersion('2.7.2',Yii::app()->request->getParam('app_version',''))){
-            $criteria->type('!=','subject');
-        }
-        $criteria->sort('order', EMongoCriteria::SORT_DESC);
-        $cursor = Slide::model()->findAll($criteria);
-        $rows = CommonFn::getRows($cursor); 
-        foreach ($rows as $key => $value) {
-            if(isset($value['city_info'])&&isset($value['city_info']['province'])&&$value['city_info']['province']!=$city_info_pro&&$value['city_info']['province']!=''){
-                unset($rows[$key]);
-            }elseif(isset($value['end_time'])&&$value['end_time']<=time()&&$value['end_time']!==0&&!empty($value['end_time'])){
-                unset($rows[$key]);
-            }
-        }
-
-        $parsedRows = Slide::model()->parse($rows);
-        $parsedRows = array_values($parsedRows);
-        CommonFn::requestAjax(true,'',$parsedRows);
-    }
-
-
-
-    //积分规则
-    public function actionScoreRule(){
-        $score_rule = Yii::app()->params['score_rule'];
-        $data = array();
-        foreach ($score_rule as $value) {
-            $data[] = $value;
-        }
-        CommonFn::requestAjax(true,'',$data);
-    }
 
-    //发帖选择圈子接口
-    public function actionTopicGroupList(){
-        $user_id = Yii::app()->request->getParam('user_id');
-        if(!CommonFn::isMongoId($user_id)){
-            CommonFn::requestAjax(false,CommonFn::getMessage('message','params_illegal'));
-        }
-        $user = RUser::get(new MongoId($user_id));
-        if(!$user){
-            CommonFn::requestAjax(false,CommonFn::getMessage('message','params_illegal'));
-        }
-        $follow_groups = $user->groups;
-        $criteria = new EMongoCriteria();
-        $criteria->can_topic('==',1);
-        $criteria->status('==',1);
-        $criteria->sort('order', EMongoCriteria::SORT_DESC);
-        $cursor = Group::model()->findAll($criteria);
-        $first_section = array();
-        $second_section = array();
-        foreach ($cursor as $key => $value) {
-            if(in_array((string)$value->_id,$follow_groups)){
-                $first_section[] = array('id'=>(string)$value->_id,'name'=>(string)$value->name,'avatar'=>$value->avatar);
-            }elseif(!isset($value->city_info['city']) || empty($value->city_info['city']) || (isset($user->city_info['city']) && $value->city_info['city'] == $user->city_info['city'])){
-                $second_section[] = array('id'=>(string)$value->_id,'name'=>(string)$value->name,'avatar'=>$value->avatar);
-            }
-        }
-        $group_list = array_merge($first_section,$second_section);
-        CommonFn::requestAjax(true,'success',array('group_list'=>$group_list));
-    }
-
-    //客户端手动更新
-    public function actionUpdateApp(){
-        $version = Yii::app()->request->getParam('app_version');
-        $app_client_id = Yii::app()->request->getParam('app_client_id');
-        $channel = Yii::app()->request->getParam('channel','');
-        $network_type = Yii::app()->request->getParam('network_type','');
-        if(empty($version)||empty($app_client_id)){
-            CommonFn::requestAjax(false,CommonFn::getMessage('message','request_illegal'));
-        }
-        if($app_client_id == 2){
-            $leatest_version = Service::factory('VariableService')->getVariable('android_new_version');
-        }elseif($app_client_id == 1){
-            $leatest_version = Service::factory('VariableService')->getVariable('ios_new_version');
-        }else{
-            CommonFn::requestAjax(false,CommonFn::getMessage('message','request_illegal'));
-        }
-        if($network_type == 'wifi' && CommonFn::compareVersion($leatest_version,Yii::app()->request->getParam('app_version',''))){
-            if($app_client_id == 2){
-                $channel_apk = Yii::app()->params['channel_apk'];
-                if(isset($channel_apk[$channel])){
-                    $download_url = $channel_apk[$channel];
-                }else{
-                    $download_url = $channel_apk['guanwang'];
-                }
-                $info = array('new_version'=>$leatest_version,'size' => '34M','download'=>$download_url,'message'=>'新爪爪出来咯,快来找我玩≧△≦');
-            }else{
-                $info = array('new_version'=>$leatest_version,'message'=>'新爪爪出来咯,快来找我玩≧△≦');
-            }
-            CommonFn::requestAjax(true,CommonFn::getMessage('message', 'have_newer'),$info);
-        }else{
-            CommonFn::requestAjax(false,'');
-        }
-    }
 
     //获取全部的城市信息
     public function actionGetAllCity(){
@@ -441,75 +201,7 @@ class CommonController extends ApiBaseController {
         echo $result;
     }
 
-    public function actionInit(){
-        $cache = new ARedisCache();
-        $key = 'data_cache_common_init';
-        $data_cache = $cache->get($key);
-        $data = array();
-        if($data_cache){
-            $data = unserialize($data_cache);
-        }else{
-            $host = ENVIRONMENT=='product'?'www.yiguanjia.me':'wwwtest.yiguanjia.me';
-            $hot_keys = trim(Service::factory('VariableService')->getVariable('hot_keywords'));
-            $hot_keys = explode("\n",$hot_keys);
-            $criteria = new EMongoCriteria();
-            $criteria->time('<=',time());
-            $criteria->limit(1);
-            $criteria->sort('time',EMongoCriteria::SORT_DESC);
-            $r_card = RecommendCard::model()->findAll($criteria);
-            $new_card_time = 0;
-            foreach ($r_card as $key => $value) {
-                $new_card_time = $value->time;
-                break;
-            }
-            $subject = new Subject();
-            $criteria = new EMongoCriteria();
-            $criteria->is_recommend('==', 1);
-            $criteria->sort('rank',EMongoCriteria::SORT_DESC);
-            $criteria->status('==', 1);
-            $criteria->limit(8);
-            $res = $subject->findAll($criteria);
-            $data['recommend_subject'] = array_values($subject->parse($res));
-            $data['limit_conf'] = Yii::app()->params['limit_conf'];
-            $data['new_user_coupons_value'] = Yii::app()->params['new_user_coupons_value']?Yii::app()->params['new_user_coupons_value']:0;
-            $data['app_video_conf'] = Yii::app()->params['app_video_conf'];
-            $data['new_card_time'] = $new_card_time;
-            $data['hot_keywords'] = $hot_keys;
-            $data['report_reason'] = Yii::app()->params['report_reason'];
-            $data['certify_url'] = isset(Yii::app()->params['certify_url'])?Yii::app()->params['certify_url']:'';
-            $data['tool_box_url'] = 'http://common.yiguanjia.me/webapp/pet';
-            $data['deal_url'] = 'http://'.$host.'/o2o/web/index/deal?need_header=0';
-            $pic_edit = Service::factory('VariableService')->getVariable('pic_edit');
-            $data['pic_edit'] = intval($pic_edit);
-            $data['topic_report_reason'] = Yii::app()->params['topic_report_reason'];
-            $data['user_report_reason'] = Yii::app()->params['user_report_reason'];
-            $data['kefu_user'] = Yii::app()->params['kefu_user'];
-            $data['enable_clear_cache'] = 0;
-            $updata_message = array('title'=>'有新版本发布了','content' => CommonFn::getMessage('message','have_newer'));
-            $data['updata_message'] = $updata_message;
-            $cache->set($key,serialize($data),300);
-        }
-        $close_versions = explode(',',Service::factory('VariableService')->getVariable('close_versions'));
-        if( in_array(Yii::app()->request->getParam('app_version',''),$close_versions)){
-            $data['foreign_link_open'] = 0;
-            $data['lottery_open'] = 0;
-        }else{
-            $data['lottery_open'] = 1;
-            $data['foreign_link_open'] = 1;
-        }
-        $data['enable_clear_cache'] = 1;
-        $data['certify_type'] = Yii::app()->params['new_certify_type'];
-        //最新版本
-        $app_client_id = Yii::app()->request->getParam('app_client_id');
-        $leatest_version = '';
-        if($app_client_id == 2){
-            $leatest_version = Service::factory('VariableService')->getVariable('android_new_version');
-        }elseif($app_client_id == 1){
-            $leatest_version = Service::factory('VariableService')->getVariable('ios_new_version');
-        }
-        $data['new_app_version'] = $leatest_version;
-        CommonFn::requestAjax(true,'',$data);
-    }
+    
 
     public function actionGetUrl(){
         $url_id = Yii::app()->getRequest()->getParam("url_id");

+ 1 - 338
www/protected/modules/api/controllers/ShopController.php

@@ -10,105 +10,7 @@ class ShopController extends ApiBaseController{
         }
         return $this->verify();
     }
-    /**
-     * 商城首页
-     */
-    public function actionIndex(){
-        $user_id = Yii::app()->getRequest()->getParam("user_id");
-        $page = intval(Yii::app()->getRequest()->getParam("page",1));
-        $user = CommonFn::getObJ($user_id,"ZUser");
-        //获取所有商品
-        $current_time = time();
-        $pagesize = Yii::app()->params['shopIndexPageSize'];
-        $conditions = array(
-                                'status'=>array('==',1),
-                                'start_time'=>array('<=',$current_time),
-                                'end_time'=>array('>=',$current_time),
-                                'count'=>array('>=',1),
-                            );
-        $order = array(
-                        'order'=>'desc',
-                        );
-        $model = new Goods();
-        $pagedata = CommonFn::getPagedata($model,$page,$pagesize,$conditions,$order);
-        $goods_list = array();
-        foreach ($pagedata['res'] as $key => $value) {
-            if(isset($value['city_info']['province']) && $value['city_info']['province']){
-                if($user && $user->city_info['province'] == $value['city_info']['province']){
-                    if($value['city_info']['city'] && $value['city_info']['city']!=$user->city_info['city']){
-                        continue;
-                    }else{
-                        $goods_list[] = $value;
-                    }
-                }else{
-                    continue;
-                }
-            }else{
-                $goods_list[] = $value;
-            }
-        }
-        $data['goods'] = $goods_list;
-        $Key = HelperKey::generateRedisKey(date('YmdHi'),'luck_users');
-        $luckey_list = UserActionRedis::get($Key);
-        if($luckey_list){
-            $data['luckey_list'] = json_decode($luckey_list);
-        }else{
-            $criteria = new EMongoCriteria();
-            $criteria->type('==','lottery');
-            $lottery_goods = $model->findAll($criteria);
-            $criteria = new EMongoCriteria();
-            $model = new Order();
-            $criteria->sort('time',EMongoCriteria::SORT_DESC);
-            $criteria->limit(10);
-            $goods_ids = array();
-            if($lottery_goods){
-                foreach ($lottery_goods as $key => $value) {
-                    $goods_ids[] = $value->_id;
-                    // $criteria->addCond('goods','or',array(array('goods_id' => $value->_id,'count' => 1)));
-                }
-            }
-            $criteria->addCond('goods.goods_id','in',$goods_ids);
-            $lottery_list = $model->findAll($criteria);
-            $lucke_list =array();
-            foreach ($lottery_list as $key => $value) {
-                $order = $model->parseRow($value);
-                $temp['user_name'] = $order['user']['user_name'];
-                $temp['goods'] = $order['goods'][0];
-                unset($temp['goods']['score']);
-                unset($temp['goods']['type']);
-                unset($temp['goods']['avatar']);
-                unset($temp['goods']['buy_count']);
-                unset($temp['goods']['market_price']);
-                $luckey_list[] = $temp;
-            }
-            UserActionRedis::set($Key,json_encode($luckey_list));
-            $data['luckey_list'] = $luckey_list;
-        }
-        CommonFn::requestAjax(true,CommonFn::getMessage('message','operation_success'),$data,200,array('sum_count' => $pagedata['sum_count'],'sum_page'=>$pagedata['sum_page'],'page_size'=>$pagedata['page_size'],'current_page'=>$pagedata['current_page']));
-    }
 
-    /**
-     * 商品详情
-     */
-    public function actiongoodsDetail(){
-        $goods_id = Yii::app()->getRequest()->getParam("goods_id");
-        $user_id = Yii::app()->getRequest()->getParam("user_id");
-        if(!$goods_id){
-            CommonFn::requestAjax(false,CommonFn::getMessage('message','params_illegal'));
-        }
-        $goods = CommonFn::apigetObJ($goods_id,"ZGoods",CommonFn::getMessage('shop','goods_not_exist'));
-        $data = Goods::model()->parseRow($goods);
-        $user_obj = RUser::get(new MongoId($user_id));
-        $score_enough = false;
-        if($user_obj){
-            $user = RUser::model()->parseRow($user_obj);
-            if($user['score'] >= $goods->score){
-                $score_enough = true;
-            }
-        }
-        $data['score_enough'] = $score_enough;
-        CommonFn::requestAjax(true,CommonFn::getMessage('message','operation_success'),$data);
-    }
 
     /**
      * 新增收货地址
@@ -254,246 +156,7 @@ class ShopController extends ApiBaseController{
         }
     }
 
-    public function actionCheckPermission(){
-        $user_id = Yii::app()->getRequest()->getParam("user_id");
-        $goods_id = Yii::app()->getRequest()->getParam("goods_id");
-        $user_obj = CommonFn::apigetObJ($user_id,"ZUser",CommonFn::getMessage('user','id_not_exist'),201);
-        if($user_obj->status == 0){
-            CommonFn::requestAjax(false,CommonFn::getMessage('user','user_shop_forbidden'));
-        }
-        $user = RUser::model()->parseRow($user_obj);
-        $goods = CommonFn::apigetObJ($goods_id,"ZGoods",CommonFn::getMessage('shop','goods_not_exist'));
-        $level_limit = $goods->min_level;
-        if($user['level']<$level_limit){
-            CommonFn::requestAjax(false,CommonFn::getMessage('shop','level_too_low'));
-        }
-        if($goods->count<=0){
-            CommonFn::requestAjax(false,CommonFn::getMessage('shop','goods_count_empty'),array('refresh'=>true));
-        }
-        if($user['score'] < $goods->score){
-            CommonFn::requestAjax(false,CommonFn::getMessage('shop','score_too_low'));
-        }
-        $criteria = new EMongoCriteria();
-        $criteria->user('==',$user_obj->_id);
-        $criteria->goods('==',array(array('goods_id' => $goods->_id,'count' => 1)));
-        $criteria->status('!=',-2);
-        $have_exchange = Order::model()->count($criteria);
-        if($have_exchange>=$goods->max_exchange){
-            CommonFn::requestAjax(false,CommonFn::getMessage('shop','have_too_much'));
-        }
-        CommonFn::requestAjax(true,'success',(object)array());
-    }
-
-    /**
-     * 商品兑换
-     */
-    public function actionExchange(){
-        $user_id = Yii::app()->getRequest()->getParam("user_id");
-        $goods_id = Yii::app()->getRequest()->getParam("goods_id");
-        $memo = Yii::app()->getRequest()->getParam("memo","");
-        $address_id = Yii::app()->getRequest()->getParam("address_id");
-        if(!$user_id||!$goods_id||!$address_id){
-            CommonFn::requestAjax(false,CommonFn::getMessage('message','params_illegal'));
-        }
-        $user_obj = CommonFn::apigetObJ($user_id,"ZUser",CommonFn::getMessage('user','id_not_exist'),201);
-        $user = RUser::model()->parseRow($user_obj);
-        if($user_obj->status == 0){
-            CommonFn::requestAjax(false,CommonFn::getMessage('user','user_shop_forbidden'));
-        }
-        $goods = CommonFn::apigetObJ($goods_id,"ZGoods",CommonFn::getMessage('shop','goods_not_exist'));
-        $address_list = $user_obj->shop_address?$user_obj->shop_address:array();
-        $address = array();
-        foreach ($address_list as $value) {
-            if($address_id == $value['address_id']){
-                $address = $value;
-            }
-        }
-        if(!$address){
-            CommonFn::requestAjax(false,CommonFn::getMessage('shop','address_false'));
-        }
-        if ($goods->type == 'exchange' && $goods->status == 1) {
-            $criteria = new EMongoCriteria();
-            $criteria->user('==',$user_obj->_id);
-            $criteria->goods('==',array(array('goods_id' => $goods->_id,'count' => 1)));
-            $criteria->status('!=',-2);
-            $have_exchange = Order::model()->count($criteria);
-            if($have_exchange>=$goods->max_exchange){
-                CommonFn::requestAjax(false,CommonFn::getMessage('shop','have_too_much'));
-            }
-            $level_limit = $goods->min_level;
-            if($user['level']<$level_limit){
-                CommonFn::requestAjax(false,CommonFn::getMessage('shop','level_too_low'));
-            }
-            if($goods->count<=0){
-                CommonFn::requestAjax(false,CommonFn::getMessage('shop','goods_count_empty'));
-            }
-            if($user['score'] < $goods->score){
-                CommonFn::requestAjax(false,CommonFn::getMessage('shop','score_too_low'));
-            }
-             
-            $order = new Order();
-            $order->price = $goods->score;
-            $order->time = time();
-            $order->goods = array(array('goods_id' => $goods->_id,'count' => 1));
-            $order->user = $user_obj->_id;
-            $order->status = 0;
-            $order->memo = $memo;
-            $order->address = $address;
-            $result = Service::factory('ScoreService')->cutDownScore($user_id,'exchange_goods',$goods->score);
-            if($result && $order->save()){
-                $goods->count = $goods->count>=1?$goods->count-1:0;
-                $goods->update(array('count',true));
-                $data['order_info'] = Order::model()->parseRow($order);
-                CommonFn::requestAjax(true,CommonFn::getMessage('message','operation_success'),$data);
-            }else{
-                CommonFn::requestAjax(false,'order_false',array());
-            }
-        }elseif($goods->type == 'lottery'){
-            $order_id = Yii::app()->getRequest()->getParam("order_id");
-            $order = CommonFn::apigetObJ($order_id,"ZOrder",CommonFn::getMessage('message','params_illegal'));
-            $order->address = $address;
-            $order->memo = $memo;
-            $order->status = 0;
-            if($order->update(array('address','memo','status'),true)){
-                $data['order_info'] = Order::model()->parseRow($order);
-                CommonFn::requestAjax(true,CommonFn::getMessage('message','operation_success'),$data);
-            }else{
-                CommonFn::requestAjax(false,'order_false',array());
-            }
-        }else{
-            CommonFn::requestAjax(false,CommonFn::getMessage('shop','goods_no_exchange'));
-        }
-    }
-
-    /**
-     * 商品抽奖
-     */
-    public function actionLottery(){
-        $user_id = Yii::app()->getRequest()->getParam("user_id");
-        $goods_id = Yii::app()->getRequest()->getParam("goods_id");
-        $address_id = Yii::app()->getRequest()->getParam("address_id");
-        $user_obj = CommonFn::apigetObJ($user_id,"ZUser",CommonFn::getMessage('user','id_not_exist'),201);
-        $user = RUser::model()->parseRow($user_obj);
-        if($user_obj->status == 0){
-            CommonFn::requestAjax(false,CommonFn::getMessage('user','user_shop_forbidden'));
-        }
-        $goods = CommonFn::apigetObJ($goods_id,"ZGoods",CommonFn::getMessage('shop','goods_not_exist'));
-        $level_limit = $goods->min_level;
-        if($user['level']<$level_limit){
-            CommonFn::requestAjax(false,CommonFn::getMessage('shop','level_too_low'));
-        }
-        if($goods->count<=0){
-            CommonFn::requestAjax(false,CommonFn::getMessage('shop','goods_count_empty'));
-        }
-        if($goods->end_time <= time() || $goods->status == -2){
-            CommonFn::requestAjax(false,CommonFn::getMessage('shop','goods_not_exist'));
-        }
-        if($user['score'] < $goods->score){
-            CommonFn::requestAjax(false,CommonFn::getMessage('shop','score_too_low')); 
-        }
-        $address_list = $user_obj->shop_address?$user_obj->shop_address:array();
-        $address = array();
-        foreach ($address_list as $value) {
-            if($address_id == $value['address_id']){
-                $address = $value;
-            }
-        }
-        if(!$address){
-            CommonFn::requestAjax(false,CommonFn::getMessage('shop','address_false'));
-        }
-        if ($goods->type == 'lottery') {
-            $criteria = new EMongoCriteria();
-            $criteria->user('==',$user_obj->_id);
-            $criteria->goods('==',array(array('goods_id' => $goods->_id,'count' => 1)));
-            $criteria->status('!=',-2);
-            $have_exchange = Order::model()->count($criteria);
-            if($have_exchange>=$goods->max_exchange){
-                CommonFn::requestAjax(false,CommonFn::getMessage('shop','have_too_much'));
-            }
-            $date = date('Ymd');
-            $Key = HelperKey::generateUserActionKey($user_id,$date,'lottery',$goods_id);
-            $times = UserActionRedis::get($Key);
-            $limit = $goods->max_times_per_day;
-            if($times>=$limit){
-                CommonFn::requestAjax(false,CommonFn::getMessage('shop','lottery_too_much'));
-            }else{
-                UserActionRedis::set($Key,$times+1);
-            }
-            $result = Service::factory('ScoreService')->cutDownScore($user_id,'lottery_goods',$goods->score);
-            $probability = $goods->probability;
-            $goods->lottertimes += 1; 
-            $goods->update(array('lottertimes'),true);
-
-            // 用户中奖历史检查
-            // 若用户已累计中奖十次以上则无法中奖
-            $criteria_order = new EMongoCriteria();
-            $criteria_order->user('==', new MongoId($user_id));
-            $all_orders = Order::model()->findAll($criteria_order);
-            if ($all_orders->count() >= 10) {
-                $data['user'] = RUser::model()->parseRow($user_obj,array('id','score'));
-                CommonFn::requestAjax(true,CommonFn::getMessage('shop','bad_luckey'),$data);
-            }
-
-            $result = Service::factory('LotteryService')->checkLucky($probability);
-            if($result==1){
-                $order = new Order();
-                $order->time = time();
-                $order->goods = array(array('goods_id' => $goods->_id,'count' => 1));
-                $order->user = $user_obj->_id;
-                $order->status = 3;
-                $order->address = $address;
-                $data['user'] = RUser::model()->parseRow($user_obj,array('id','score'));
-                if($result && $order->save()){
-                    $goods->count = $goods->count>=1?$goods->count-1:0;
-                    $goods->update(array('count',true));
-                    $data['order_id'] = (string)$order->_id;
-                    CommonFn::requestAjax(true,CommonFn::getMessage('shop','good_luckey'),$data);
-                }else{
-                    CommonFn::requestAjax(true,CommonFn::getMessage('shop','bad_luckey'),$data);
-                }
-            }else{
-                $data['user'] = RUser::model()->parseRow($user_obj,array('id','score'));
-                CommonFn::requestAjax(true,CommonFn::getMessage('shop','bad_luckey'),$data);
-            }
-        }else{
-            CommonFn::requestAjax(false,CommonFn::getMessage('shop','goods_no_lottery'));
-        }
-    }
-
-    /**
-     * 订单列表
-     */
-    public function actionOrderList(){
-        $user_id = Yii::app()->getRequest()->getParam("user_id");
-        $user_obj = CommonFn::apigetObJ($user_id,"ZUser",CommonFn::getMessage('user','id_not_exist'),201);
-        $page = intval(Yii::app()->getRequest()->getParam("page",1));
-        $pagesize = Yii::app()->params['OrderListPageSize'];
-        $conditions = array(
-                                'user'=>array('==',$user_obj->_id)
-                            );
-        $order = array(
-                        'time'=>'desc',
-                        );
-        $model = new Order();
-        $pagedata = CommonFn::getPagedata($model,$page,$pagesize,$conditions,$order);
-        $order_list = $pagedata['res'];
-        foreach ($order_list as $key => $value) {
-            $order_list[$key] = $model->output($value,array('id','price','order_num','time','time_str','status','status_str','status_str_color','goods'));
-        }
-        $data = array_values($order_list);
-        CommonFn::requestAjax(true,CommonFn::getMessage('message','operation_success'),$data,200,array('sum_count' => $pagedata['sum_count'],'sum_page'=>$pagedata['sum_page'],'page_size'=>$pagedata['page_size'],'current_page'=>$pagedata['current_page']));
-    }
-
-    /**
-     * 订单详情
-     */
-    public function actionOrderDetail(){
-        $order_id = Yii::app()->getRequest()->getParam("order_id");
-        $order = CommonFn::apigetObJ($order_id,"ZOrder",CommonFn::getMessage('message','params_illegal'));
-        $data = Order::model()->parseRow($order,array('id','price','express_info','time','memo','order_num','time_str','status','status_str','status_str_color','goods','address'));
-        CommonFn::requestAjax(true,CommonFn::getMessage('message','operation_success'),$data);
-    }
-
+    
 
 
 } 

+ 1 - 536
www/protected/modules/api/controllers/UserController.php

@@ -394,200 +394,7 @@ class UserController extends ApiBaseController{
         }
     }
 
-    /**
-     * 按照时间线展现帖子列表
-     * 当前日期的帖子没有显示完后,会追加当天剩余帖子数.并传递实际数据偏移量给前端
-     */
-    public function actionInfoByTimeline(){
-        $user_id = Yii::app()->getRequest()->getParam("user_id");
-        $uid = Yii::app()->getRequest()->getParam("to_user_id");
-        $user_name = Yii::app()->getRequest()->getParam("user_name");
-        if($user_name){
-            $criteria = new EMongoCriteria();
-            $criteria->user_name('==',$user_name);
-            $res = RUser::model()->find($criteria);
-            if(!$res){
-                CommonFn::requestAjax(false,CommonFn::getMessage('user','user_not_exist'),array(),204);
-            }else{
-                $uid = $res->_id;
-            }
-        }
-        $page = intval(Yii::app()->getRequest()->getParam("page",1));
-        if(empty($page)){
-            $page = 1;
-        }
-        $offset = Yii::app()->getRequest()->getParam('offset',0);
-        if(empty($user_id) && empty($uid)){
-            CommonFn::requestAjax(false,CommonFn::getMessage('user','id_not_empty'),201);
-        }
-        if($uid){
-            if($user_id){
-                $user_node = new UserNodeRecord($user_id);
-                $relation = $user_node->relation($uid);
-            }
-        }
-        if($user_id){
-            $id = $user_id;
-        }
-        if($uid){
-            $id = $uid;
-        }
-        $model = new RUser();
-        $user_obj = CommonFn::apigetObJ($id,"ZUser",CommonFn::getMessage('user','id_not_exist'),201);
-        $user_data = $model->parseRow($user_obj->attributes);
-        $user_data['relation'] = isset($relation)?$relation:0;
-        //获取用户帖子信息
-        $topic_model = new ZTopic();
-        $user_topics = array();
-        $pagesize = 20;
-        $page_offset = ($page - 1) * $pagesize;
-        if(!$offset){
-            $offset = $offset > 0 && $page_offset < $offset ? $offset : $page_offset;
-        }
-        $criteria = new EMongoCriteria();
-        $criteria->user('==',$user_obj->_id);
-        $criteria->status("==",1);
-        $criteria->limit($pagesize)->sort('time',EMongoCriteria::SORT_DESC)->offset($offset);
-        $model = new Topic();
-        $cursor = $model->findAll($criteria);
-        $rows = CommonFn::getRows($cursor);
-        $rows = $model->parse($rows);
-        //获取有追加数据
-        if(count($rows)<1){
-            $data = array(
-                'user' => $user_data,
-                'topic_list' => array(),
-                'offset' => $offset,
-            );
-            CommonFn::requestAjax(true,CommonFn::getMessage('message','operation_success'),$data,200,array('is_more'=>0));
-        }
-        $last_topic = $rows[count($rows)-1];
-        $append_data = $topic_model->getAppendDateByDate($uid,$last_topic['last_post_time']);
-        if($append_data){
-            $rows = array_merge($rows,$append_data);
-        }
-        //按时间顺序排列
-        foreach($rows as $row ){
-            $user_topics[$row['date']]['time'] = $row['date'];
-            $user_topics[$row['date']]['data'][] = $row;
-        }
-        $user_topics = array_values($user_topics);
-
-        $current_offset = count($rows)+$offset;     //当前实际数据偏移值
-        if(count($rows)<20){
-            $is_more = 0;
-        }else{
-            $is_more = 1;
-        }
-        //追加到用户数据中
-        $data = array(
-            'user' => $user_data,
-            'topic_list' => $user_topics,
-            'offset' => $current_offset
-        );
-        CommonFn::requestAjax(true,CommonFn::getMessage('message','operation_success'),$data,200,array('is_more'=>$is_more));
-    }
-
-    //用户收藏信息接口
-    public function actionFavList(){
-        $user_id = Yii::app()->getRequest()->getParam("user_id");
-        $page = intval(Yii::app()->getRequest()->getParam("page",1));
-        if(empty($page)){
-            $page = 1;
-        }
-        //获取用户收藏信息
-        $user = CommonFn::apigetObJ($user_id,'ZUser',CommonFn::getMessage('user','id_not_exist'),201);
-        $pagesize = Yii::app()->params['userFavsPageSize'];
-        $conditions = array(
-            'user'=>array('==',$user->_id)
-        );
-        $order = array(
-            'time'=>'desc',
-        );
-        $model = new Fav();
-        $pagedata = CommonFn::getPagedata($model,$page,$pagesize,$conditions,$order);
-        $user_favs = $pagedata['res'];
-        if(!empty($user_favs)){
-            foreach ($user_favs as $key => $value) {
-                if($value['fav_obj']['status']!=1){
-                    unset($user_favs[$key]);
-                }
-            }
-        }
-        $data = array();
-        foreach($user_favs as $fav){
-            $z_like = new ZLike();
-            $like = $z_like->getLikeByLikeObj($user_id,$fav['fav_obj']['id']);
-            if(empty($like)){
-                $fav['fav_obj']['is_liked'] = false;
-            }else{
-                $fav['fav_obj']['is_liked'] = true;
-            }
-            $data[] = $fav['fav_obj'];
-        }
-        CommonFn::requestAjax(true,CommonFn::getMessage('message','operation_success'),$data,200,array('sum_count' => $pagedata['sum_count'],'sum_page'=>$pagedata['sum_page'],'page_size'=>$pagedata['page_size'],'current_page'=>$pagedata['current_page']));
-    }
-
-    //用户帖子列表页面
-    public function actionTopicList(){
-        $user_id = Yii::app()->getRequest()->getParam("user_id");
-        $uid = Yii::app()->getRequest()->getParam("to_user_id");
-        $page = intval(Yii::app()->getRequest()->getParam("page",1));
-        if(empty($page)){
-            $page = 1;
-        }
-        $offset = Yii::app()->getRequest()->getParam('offset',0);
-
-        if(empty($user_id) && empty($uid)){
-            CommonFn::requestAjax(false,CommonFn::getMessage('user','id_not_empty'),201);
-        }
-        if($user_id){
-            $id = $user_id;
-            $time_list_flag = true;
-        }
-        if($uid){
-            $id = $uid;
-            $time_list_flag = false;
-        }
-
-        //获取用户帖子列表
-        $topic_model = new ZTopic();
-        $user_topics = array();
-        $rows = $topic_model->getUserTopic($id,$page,$offset);
-        if(count($rows)<1){
-            $data = array(
-                'topic_list' => array(),
-                'offset' => $offset,
-            );
-            CommonFn::requestAjax(true,CommonFn::getMessage('message','operation_success'),$data);
-        }
-
-        if($time_list_flag){
-            //获取有追加数据
-            $last_topic = $rows[count($rows)-1];
-            $append_data = $topic_model->getAppendDateByDate($id,$last_topic['last_post_time']);
-            if($append_data){
-                $rows = array_merge($rows,$append_data);
-            }
-
-            //按时间顺序排列
-            foreach($rows as $row ){
-                $user_topics[$row['date']]['time'] = $row['date'];
-                $user_topics[$row['date']]['data'][] = $row;
-            }
-            $user_topics = array_values($user_topics);
-
-        }else{
-            $user_topics = $rows;
-        }
-        $current_offset = count($rows);     //当前实际数据偏移值
-
-        $data = array(
-            'topic_list' => $user_topics,
-            'offset' => $current_offset,
-        );
-        CommonFn::requestAjax(true,CommonFn::getMessage('message','operation_success'),$data);
-    }
+    
 
     //修改用户资料
     public function actionEdit(){
@@ -664,347 +471,5 @@ class UserController extends ApiBaseController{
         }
     }
 
-    //用户爪币记录
-    public function actionScoreLog(){
-        $user_id = Yii::app()->getRequest()->getParam("user_id");
-        $page = intval(Yii::app()->getRequest()->getParam("page",1));
-        if(empty($page)){
-            $page = 1;
-        }
-        if(empty($user_id) ){
-            CommonFn::requestAjax(false,CommonFn::getMessage('user','id_not_exist'),201);
-        }
-        if($user_id){
-            $id = $user_id;
-        }
-        $deviceid =  Yii::app()->request->getParam('device_id');
-        //设置首次访问时间,保证一次浏览的回复列表不变
-        $actiontime = CommonFn::getFirstTime(ActionTimeRedis::TYPE_GET_SCORELOG,$deviceid,$page);
-        $pagesize = Yii::app()->params['userScoreLogPageSize'];
-        $conditions = array(
-            'user'=>array('==',$id),
-            'time'=>array('<=',$actiontime)
-        );
-        $order = array(
-            'time'=>'desc',
-        );
-        $model = new UserScoreLog();
-        $pagedata = CommonFn::getPagedata($model,$page,$pagesize,$conditions,$order);
-        $logs = $pagedata['res'];
-        CommonFn::requestAjax(true,CommonFn::getMessage('message','operation_success'),$logs,200,array('sum_count' => $pagedata['sum_count'],'sum_page'=>$pagedata['sum_page'],'page_size'=>$pagedata['page_size'],'current_page'=>$pagedata['current_page']));
-    }
-
-    //用户拒绝接受推送
-    public function actionSetPush(){
-        $user_id = Yii::app()->getRequest()->getParam("user_id");
-        $user = CommonFn::apigetObJ($user_id,"ZUser",CommonFn::getMessage('user','id_not_exist'),201);
-        if($user->receive_push == 0){
-            $user->receive_push = 1;
-            if($user->update(array('receive_push'),true)){
-                CommonFn::requestAjax(true,CommonFn::getMessage('message','operation_success'),array('op'=>'receive'));
-            }
-        }else{
-            $user->receive_push = 0;
-            if($user->update(array('receive_push'),true)){
-                CommonFn::requestAjax(true,CommonFn::getMessage('message','operation_success'),array('op'=>'unreceive'));
-            }
-        }
-    }
-
-    //用户分享成功后增加爪币
-    public function actionShareSuccess(){
-        $user_id = Yii::app()->getRequest()->getParam("user_id");
-        $user = CommonFn::apigetObJ($user_id,"ZUser",CommonFn::getMessage('user','id_not_exist'),201);
-        $add_score = $this->addScore($user_id,'score_share');
-        $result = array();
-        if($add_score['status']){
-            $add_score['score_change'] = $add_score['score'];
-            $add_score['current_score'] = $add_score['current_score'];
-            $add_score['score_type'] = '分享成功';
-            CommonFn::requestAjax(true,'分享增加爪币成功',array(),301,$add_score);
-        }else{
-            CommonFn::requestAjax(false,'分享增加爪币失败');
-        }
-    }
-
-    //用户申请认证接口
-    public function actionApplyCertify(){
-        $data = array();
-        $data['content'] = '您好,目前握爪仅开放认证宠物医生、营养师、训犬师、美容师,认证需要您相关的资格证书或学校就读证书照片及您与证书合影的照片,直接在私信里发给爪爪就好了。';
-        $data['from_user'] = Yii::app()->params['kefu_user'];
-        $data['to_user'] = Yii::app()->request->getParam('user_id','');
-        $date = date('Ymd');
-        $Key = HelperKey::generateUserActionKey('applycertify',$date,$data['to_user']);
-        $status = UserActionRedis::get($Key);
-        if($status){
-            CommonFn::requestAjax(false,'你今天已提交过认证申请,请不要重复申请');
-        }else{
-            UserActionRedis::set($Key,true);
-        }
-        $data['voice'] = json_decode(Yii::app()->request->getParam('voice'),true);
-        $data['video'] = json_decode(Yii::app()->request->getParam('video'),true);
-        $data['pics'] =  json_decode(Yii::app()->request->getParam('pics'),true);
-        $z_message = new ZMessage();
-        $result =  $z_message->addMessage($data);
-        if($result['status']){
-            CommonFn::requestAjax(true,'已提交认证申请');
-        }else{
-            CommonFn::requestAjax(false,'提交申请失败,请重试');
-        }
-    }
-
-    //用户加与取消关注接口
-    public function actionFollow(){
-        $user_id = Yii::app()->getRequest()->getParam("user_id");
-        $user = CommonFn::apigetObJ($user_id,"ZUser",CommonFn::getMessage('user','id_not_exist'),201);
-        $f_id = Yii::app()->getRequest()->getParam("to_user_id");
-        $f_id_list = json_decode(Yii::app()->getRequest()->getParam("to_user_list"),true);
-        if(!$f_id_list && !CommonFn::isMongoId($f_id)){
-            CommonFn::requestAjax(false,CommonFn::getMessage('message','params_illegal'));
-        }
-        $user_node = new UserNodeRecord($user->_id);
-        //批量关注
-        if(is_array($f_id_list) && !empty($f_id_list)){
-            foreach ($f_id_list as $value) {
-                $user_node->follow($value);
-            }
-            CommonFn::requestAjax(true,CommonFn::getMessage('message','operation_success'),array('op'=>'follow','follow_count'=>$user_node->follow_count(),'fans_count'=>$user_node->follower_count()));
-        }
-        if($user_node->is_following($f_id)){
-            $user_node->unfollow($f_id);
-            $op = 'unfollow';
-            $message = '取消关注成功';
-        }else{
-            $user_node->follow($f_id);
-            $message = '关注成功';
-            $op = 'follow';
-        }
-        CommonFn::requestAjax(true,$message,array('op'=>$op,'follow_count'=>$user_node->follow_count(),'fans_count'=>$user_node->follower_count()));
-    }
-
-    //好友帖子列表
-    public function actionFriendsTopicList(){
-        $last_obj_id = Yii::app()->getRequest()->getParam("last_object_id",'');
-        $user_id = Yii::app()->getRequest()->getParam("user_id");
-        $user = CommonFn::apigetObJ($user_id,"ZUser",CommonFn::getMessage('user','id_not_exist'),201);
-        if(CommonFn::isMongoId($last_obj_id)){
-            $last_topic_obj = Topic::get(new MongoId($last_obj_id));
-            if($last_topic_obj){
-                $last_obj_time = $last_topic_obj->time;
-            }
-        }else{
-            $last_obj_time = time();
-        }
-        if(!isset($last_obj_time)){
-            CommonFn::requestAjax(false,CommonFn::getMessage('message','params_illegal'));
-        }
-        //设置小红点
-        // $cache = new ARedisCache();
-        // $cache->set('friend_topic_'.$user_id,0);
-        $user_node = new UserNodeRecord($user_id);
-        $follow_list = $user_node->following();
-        $f_ids = array();
-        foreach ($follow_list as $key => $value) {
-            $f_ids[] = new MongoId($value);
-        }
-        $conditions = array(
-            'user'=>array('in',$f_ids),
-            'status'=>array('==',1),
-            'time'=>array('<',$last_obj_time)
-        );
-        $order = array(
-            '_id'=>'desc',
-        );
-        $model = new Topic();
-        $pagedata = CommonFn::getPagedataById($model,20,$conditions,$order);
-        $topics = $pagedata['res'];
-        foreach ($topics as $key=>$value) {
-            if($user){
-                //判断用户是否收藏过该帖子
-                $z_fav = new ZFav();
-                $fav = $z_fav->getFavByFavObj($user_id,$value['id']);
-                if(empty($fav)){
-                    $value['is_faved'] = false;
-                }else{
-                    $value['is_faved'] = true;
-                }
-
-                //判断用户是否喜欢过该帖子
-                $z_like = new ZLike();
-                $like = $z_like->getLikeByLikeObj($user_id,$value['id']);
-                if(empty($like)){
-                    $value['is_liked'] = false;
-                }else{
-                    $value['is_liked'] = true;
-                }
-            }else{
-                $value['is_faved'] = false;
-                $value['is_liked'] = false;
-            }
-            $topics[$key] = $value;
-        }
-        $data['topic_list'] = $topics;
-        CommonFn::requestAjax(true,'',$data,200,array('has_more' => $pagedata['has_more'],'page_size'=>$pagedata['page_size']));
-    }
-
-    //我的关注接口
-    public function actionFollowList(){
-        $user_id = Yii::app()->getRequest()->getParam("user_id");
-        $to_user = Yii::app()->getRequest()->getParam("to_user_id");
-        $page = Yii::app()->getRequest()->getParam("page");
-        $page_size = Yii::app()->getRequest()->getParam("page_size",20);
-        if($to_user){
-            $uid = $to_user;
-            $user_node = new UserNodeRecord($to_user);
-            $current_user_node = new UserNodeRecord($user_id);
-            $need_refresh = true;
-        }else{
-            $uid = $user_id;
-            $user_node = new UserNodeRecord($user_id);
-        }
-        $follow_list = $user_node->following();
-        $sum = count($follow_list);
-        $follow_list = array_slice($follow_list,$page_size*($page-1),$page_size*$page);
-        $user_model = new RUser();
-        foreach ($follow_list as $key => $f_user) {
-            $follow_list[$key] =  $user_model->parseRow(RUser::get(new MongoId($f_user)),array('id','user_name','sex','avatar','level','city_info','pets','certify_status','certify_info','can_access'));
-            if(isset($need_refresh)){
-                $follow_list[$key]['relation'] = $current_user_node->relation($f_user);
-            }else{
-                $follow_list[$key]['relation'] = $user_node->relation($f_user);
-            }
-        }
-        CommonFn::requestAjax(true,CommonFn::getMessage('message','operation_success'),$follow_list,200,array('sum_count' => $sum ,'sum_page'=> ceil($sum/$page_size),'page_size'=>$page_size,'current_page'=>$page));
-    }
-
-    //粉丝列表
-    public function actionFansList(){
-        $user_id = Yii::app()->getRequest()->getParam("user_id");
-        $to_user = Yii::app()->getRequest()->getParam("to_user_id");
-        $page = Yii::app()->getRequest()->getParam("page");
-        $page_size = Yii::app()->getRequest()->getParam("page_size",20);
-        if($to_user){
-            $uid = $to_user;
-            $user_node = new UserNodeRecord($to_user);
-            $current_user_node = new UserNodeRecord($user_id);
-            $need_refresh = true;
-        }else{
-            $uid = $user_id;
-            $user_node = new UserNodeRecord($user_id);
-        }
-        $followed_by = $user_node->followed_by();
-        $sum = count($followed_by);
-        $followed_by = array_slice($followed_by,$page_size*($page-1),$page_size*$page);
-        $user_model = new RUser();
-        foreach ($followed_by as $key => $f_user) {
-            $followed_by[$key] =  $user_model->parseRow(RUser::get(new MongoId($f_user)),array('id','user_name','sex','avatar','level','city_info','pets','certify_status','certify_info','can_access'));
-            if(isset($need_refresh)){
-                $followed_by[$key]['relation'] = $current_user_node->relation($f_user);
-            }else{
-                $followed_by[$key]['relation'] = $user_node->relation($f_user);
-            }
-        }
-        CommonFn::requestAjax(true,CommonFn::getMessage('message','operation_success'),$followed_by,200,array('sum_count' => $sum ,'sum_page'=> ceil($sum/$page_size),'page_size'=>$page_size,'current_page'=>$page));
-    }
-
-    //推荐关注用户
-    public function actionRecommendUsers(){
-        $user_id = Yii::app()->getRequest()->getParam("user_id");
-        $city_info = Yii::app()->getRequest()->getParam("city_info");
-        $city_info = json_decode($city_info,true);
-        $user_obj = CommonFn::apigetObJ($user_id,"ZUser",CommonFn::getMessage('user','id_not_exist'),201);
-
-        $user_node = new UserNodeRecord($user_obj->_id);
-        $follow_list = $user_node->following();
-        $follow_users = array();
-        foreach ($follow_list as $key => $value) {
-            $follow_users[] = new MongoId($value);
-        }
-
-        $follow_users[] = $user_obj->_id;
-        $criteria = new EMongoCriteria;
-        $criteria->certify_status('==',1);
-        $criteria->_id('notin',$follow_users);
-        $criteria->is_fake_user('!=',1);
-        $criteria->sort('last_visit_time',EMongoCriteria::SORT_DESC);
-        $criteria->limit(5);
-        $cursor = RUser::model()->findAll($criteria);
-        $rows = RUser::model()->parse($cursor,true,array('id','user_name','sex','avatar','level','city_info','certify_status','certify_info','can_access'));
-        $certify_users = array();
-        foreach ($rows as $value) {
-            $value['recommend_reason'] = $value['certify_info'];
-            $certify_users[] = $value;
-        }
-
-        $criteria = new EMongoCriteria;
-        if(isset($city_info['province']) && $city_info['province']){
-            $criteria->city_info->province('==',$city_info['province']);
-        }else{
-            $criteria->city_info->province('==','上海市');
-        }
-        $criteria->_id('notin',$follow_users);
-        $criteria->is_fake_user('!=',1);
-        $criteria->certify_status('!=',1);
-        $criteria->sort('last_visit_time',EMongoCriteria::SORT_DESC);
-        $criteria->limit(10);
-        $cursor = RUser::model()->findAll($criteria);
-        $rows = RUser::model()->parse($cursor,true,array('id','user_name','sex','avatar','level','city_info','certify_status','certify_info','can_access'));
-        $local_user = array();
-        foreach ($rows as $value) {
-            $value['recommend_reason'] = '同城用户';
-            $local_user[] = $value;
-        }
-
-        $criteria = new EMongoCriteria;
-        if(isset($city_info['province']) && $city_info['province']){
-            $criteria->city_info->province('!=',$city_info['province']);
-        }else{
-            $criteria->city_info->province('!=','上海市');
-        }
-        $criteria->_id('notin',$follow_users);
-        $criteria->is_fake_user('!=',1);
-        $criteria->certify_status('!=',1);
-        $criteria->sort('posts_count',EMongoCriteria::SORT_DESC);
-        $criteria->sort('last_visit_time',EMongoCriteria::SORT_DESC);
-        $criteria->limit(5);
-        $cursor = RUser::model()->findAll($criteria);
-        $rows = RUser::model()->parse($cursor,true,array('id','user_name','sex','avatar','level','city_info','certify_status','certify_info','can_access'));
-        $hot_users = array();
-        foreach ($rows as $value) {
-            $value['recommend_reason'] = '活跃用户';
-            $hot_users[] = $value;
-        }
-
-        $result = array_merge($certify_users,$local_user,$hot_users);
-        shuffle($result);
-        foreach ($result as $key => $user) {
-            $result[$key]['relation'] = $user_node->relation($user['id']);
-        }
-        CommonFn::requestAjax(true,CommonFn::getMessage('message','operation_success'),array('recommend_list'=>$result));
-    }
-
-    //用户登出接口
-    public function actionLogout(){
-        $user_id = Yii::app()->getRequest()->getParam("user_id");
-        $xinge_token = Yii::app()->getRequest()->getParam("xinge_token");
-        $app_client_id = Yii::app()->getRequest()->getParam("app_client_id");
-        require_once(APP_PATH."/protected/vendors/tencent/XingeApp.php");
-        if($app_client_id == '2'){
-            $xinge_config = Yii::app()->params['xingeConfig']['android'];
-            $push = new XingeApp($xinge_config['accessId'],$xinge_config['secretKey']);
-            $ret = $push->DeleteTokenOfAccount($user_id,$xinge_token);
-            CommonFn::requestAjax(true,'注销成功');
-        }elseif($app_client_id == '1'){
-            $xinge_ios_config = Yii::app()->params['xingeConfig']['ios'];
-            $push = new  XingeApp($xinge_ios_config['accessId'],$xinge_ios_config['secretKey']);
-            $ret = $push->DeleteTokenOfAccount($user_id,$xinge_token);
-            CommonFn::requestAjax(true,'注销成功');
-        }else{
-            CommonFn::requestAjax(false,'操作失败');
-        }
-
-
-    }
-
 
 }

+ 1 - 1
www/protected/modules/o2o/models/Comment.php

@@ -17,7 +17,7 @@ class Comment extends MongoAr
 
     public $status =1;//状态   1正常   0删除   -1垃圾
 
-    public $type;// 1=>"宠物洗澡" 2=>"宠物剪毛",3=>"宠物美容"
+    public $type;// 
 
     public $weight = 0;//评价权重
 

+ 1 - 1
www/protected/modules/o2o/models/Station.php

@@ -21,7 +21,7 @@ class Station extends MongoAr
     public $beauticians_count=1;  //保洁师数量
     public $coverage = array();//服务范围
 
-    public $types = array();//该服务点  支持的服务项目  array( 1=>array("name"=>"宠物洗澡"),2=>array("name"=>"宠物剪毛"),3=>array("name"=>"宠物美容"))
+    public $types = array();//该服务点  支持的服务项目  
 
     public static $status_option = array(
         0 => array('name' => '待营业'),

+ 2 - 2
www/webapp/common/js/config.js

@@ -97,8 +97,8 @@ define(function (require) {
             imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
           });
           wx.onMenuShareAppMessage({
-            title: '宠物上门服务,首选壹管家APP',
-            desc: '足不出户,就能享受专业保洁师为您家爱宠提供的贴心服务!',
+            title: '家政服务,首选壹管家APP',
+            desc: '足不出户,就能享受专业保洁师为您提供的贴心服务!',
             link: 'http://common.yiguanjia.me/o2o/web/index',
             imgUrl: 'http://wozhua-others.qiniudn.com/icon-o2o-home.jpg'
           });