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

www/protected/commands/GetKennelWorkCommand.php

@@ -0,0 +1,78 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: PHP
+ * Date: 2016/11/23
+ * Time: 9:11
+ */
+class GetKennelWorkCommand extends CConsoleCommand {
+    public function run($args){
+        error_reporting(E_ERROR);
+        ini_set('memory_limit', '256M');
+        //ini_set('mongo.long_as_object',1);
+        set_time_limit(0);
+        self::getKennel();
+    }
+
+    public function getKennel(){
+        $count = 0;
+        $page = intval(Yii::app()->redis->get('page'));
+        $page = 0;
+        if (empty($page)) $page =1;
+        while($page) {
+            if ($count >= 1000) {
+                Yii::app()->redis->set('page', intval(--$page));
+                exit;
+            }
+            $res = CommonFn::simple_http("http://deal.wozhua.mobi/api/kennel/list?user_id=546b16f50eb9fb494f8b4664&page=".$page++."&rows=10");
+            $res = json_decode($res,true);
+            if ($res['success']) {
+                $list = $res['data']['list'];
+
+                foreach ($list as $key => $value) {
+                    $count++;
+                    $tmp = json_decode(CommonFn::simple_http("http://deal.wozhua.mobi/api/kennel/desc?user_id=546b16f50eb9fb494f8b4664&kennel_id=" . $value['id']), true);
+                    if (!empty($tmp)) {
+                        $tmp = $tmp['data'];
+                        if (!empty(Kennel::model()->get(new MongoId($value['id'])))) {
+                            $kennel = Kennel::model()->get(new MongoId($value['id']));
+                        } else {
+                            $kennel = new Kennel();
+                        }
+                        $kennel->_id = new MongoId($value['id']);
+                        $kennel->status = 1;
+                        $kennel->weight = 0;
+                        $kennel->name = $value['name'];
+                        $kennel->avatar = $value['avatar'];
+                        $kennel->join_time = time();
+                        $kennel->region = (Object)$value['region'];
+                        $kennel->video = (Object)$value['video'];
+                        //if ($value['is_certified']) {
+                            //$kennel->type = 1;
+                        //} else {
+                            $kennel->type = 2;
+                        //}
+                        foreach ( $tmp['tags'] as $k => $v)
+                            $kennel->tags[$k] = $v;
+                        $kennel->desc = $tmp['desc'];
+                        foreach ($tmp['desc_pics'] as $k => $v) {
+                            $kennel->desc_pics[$k] = $v;
+                        }
+                        $kennel->address = $tmp['address'];
+                        $kennel->phone = $tmp['phone'];
+                        $kennel->from = 'wozhua';
+                        //$kennel->favorable_rate = $tmp['favorable_rate'];
+                        //$kennel->comment_count = $tmp['comment_count'];
+                        //$kennel->favorable_count = $tmp['favorable_count'];
+                        //$kennel->average = $tmp['favorable_star'];
+                        $kennel->save();
+                        sleep(3);
+                    }
+                }
+                sleep(3);
+            }
+        }
+    }
+
+
+}

www/protected/commands/GetPetWorkCommand.php

@@ -21,7 +21,7 @@ class GetPetWorkCommand extends CConsoleCommand
         $kennels = new Kennel();
         $cursor = $kennels->findAll();
         foreach ($cursor as $kennel) {
-            $resources = CommonFn::simple_http("http://deal.wozhua.mobi/api/pet/list?user_id=546b16f50eb9fb494f8b4664&kennel=" . $kennel['_id']);
+            $resources = CommonFn::simple_http("http://deal.wozhua.mobi/api/pet/list?user_id=546b16f50eb9fb494f8b4664&page=1&rows=2000&kennel=" . $kennel['_id']);
             $resources = json_decode($resources, true);
             if (!empty($resources['data']['list'])) {
                 $petsList = $resources['data']['list'];
@@ -40,33 +40,36 @@ class GetPetWorkCommand extends CConsoleCommand
                         $dealPet->name = $tmp['name'];
                         $dealPet->status = $tmp['status'];
                         $dealPet->price = $tmp['price'];
-                        foreach ($tmp['pics'] as $v) {
-                            $dealPet->pics[] = $v;
+                        foreach ($tmp['pics'] as $key => $v) {
+                            $dealPet->pics[$key] = $v;
                         }
+
                         $dealPet->root_parent = new MongoId($tmp['root_praent']);
                         $dealPet->kennel = new MongoId($tmp['kennel']);
                         $dealPet->pet_type = new MongoId($tmp['pet_type']);
                         $dealPet->birth_date = intval($tmp['birth_date']);
                         $dealPet->gender = $tmp['gender'];
-                        $dealPet->tags = $tmp['tags'];
-                        $dealPet->father_info = $tmp['father_info'];
-                        $dealPet->mother_info = $tmp['mother_info'];
+                        foreach ($tmp['tags'] as $key => $v)
+                            $dealPet->tags[$key] = $v;
+                        $dealPet->father_info = (Object)$tmp['father_info'];
+                        $dealPet->mother_info = (Object)$tmp['mother_info'];
                         $dealPet->desc = $tmp['desc'];
-                        $dealPet->vaccine_info = $tmp['vaccine_info'];
-                        $dealPet->add_time = $tmp['add_time'];
-                        $dealPet->sort_weight = $tmp['sort_weight'];
+                        foreach ($tmp['vaccine_info'] as $key => $v)
+                            $dealPet->vaccine_info[$key] = $v;
+                        $dealPet->add_time = time();
+                        //$dealPet->sort_weight = $tmp['sort_weight'];
                         $dealPet->delivery_time = $tmp['delivery_time'];
                         $dealPet->delivery_date = $tmp['delivery_date'];
-                        $dealPet->deworming_info = $tmp['deworming_info'];
+                        $dealPet->deworming_info = (Object)$tmp['deworming_info'];
                         $dealPet->hair_color = $tmp['hair_color'];
-                        $dealPet->video = $tmp['video'];
-                        $dealPet->carriage = $tmp['carriage'];
-                        $dealPet->last_modify = $tmp['last_modify'];
-                        $dealPet->view_count = $tmp['view_count'];
-                        $dealPet->contact_count = $tmp['contact_count'];
-                        $dealPet->region = $tmp['region'];
-                        $dealPet->last_deny_reason = $tmp['last_deny_reason'];
-
+                        $dealPet->video = (Object)$tmp['video'];
+                        $dealPet->carriage = (Object)$tmp['carriage'];
+                        //$dealPet->last_modify = $tmp['last_modify'];
+                        //$dealPet->view_count = $tmp['view_count'];
+                        //$dealPet->contact_count = $tmp['contact_count'];
+                        $dealPet->region = (Object)$tmp['region'];
+                        //$dealPet->last_deny_reason = $tmp['last_deny_reason'];
+                        $dealPet->from = 'wozhua';
 
                         $dealPet->save();
 

www/protected/controllers/ROrderController.php

@@ -760,9 +760,9 @@ class ROrderController extends AdminController{
         $data = ROrder::model()->findAll();   //
         $rows = CommonFn::getRowsFromCursor($data);
         $data = ROrder::model()->parse($rows);
-        $name='Excelfile';    //生成的Excel文件文件名
+        $name='OrderList';    //生成的Excel文件文件名
         $res=Service::factory('ExcelToArrayService')->push($data,$name);
-
+        echo "导出成功";
     }
 
 

www/protected/models/DealPet.php

@@ -1,4 +1,4 @@
-<?php 
+<?php
 /**
  * 宠物模型
  */
@@ -48,6 +48,8 @@ class DealPet extends MongoActiveRecord {
 
     public $count = 1;//现存数量   针对小宠
 
+    public $from;//数据来源   wozhua xinchong chongwushichang
+
     public static $status_option = [
         -100 => ['name' => '信息不完善'],
         -2   => ['name' => '审核未通过'],
@@ -72,7 +74,7 @@ class DealPet extends MongoActiveRecord {
     ];
 
     public function __construct($scenario = 'insert') {
-        $this->setMongoDBComponent(Yii::app()->getComponent('cute'));
+        $this->setMongoDBComponent(Yii::app()->getComponent('deal'));
         parent::__construct($scenario);
     }
 
@@ -93,37 +95,37 @@ class DealPet extends MongoActiveRecord {
             $res = unserialize($data_cache);
         }else{
             $data = array();
-            
+
             $criteria = new EMongoCriteria();
             $criteria->root_parent('==',new MongoId('54671c4b0eb9fb89048b45f5'));//狗狗
             $criteria->status('==',1);
-            $criteria->limit(4); 
+            $criteria->limit(4);
             $criteria->offset(rand(0,100));
             $cursor = self::model()->findAll($criteria);
             foreach ($cursor as $key => $value) {
                 $data[] = $value;
             }
             $dogs = self::model()->parseIndexList($cursor);
-            
+
             $criteria = new EMongoCriteria();
             $criteria->root_parent('==',new MongoId('546805e40eb9fb32018b45fe'));//猫猫
             $criteria->status('==',1);
-            $criteria->limit(5); 
+            $criteria->limit(5);
             $criteria->offset(rand(0,100));
             $cursor = self::model()->findAll($criteria);
             foreach ($cursor as $key => $value) {
                 $data[] = $value;
             }
 
-           // $criteria = new EMongoCriteria();
-           // $criteria->root_parent('notin',[new MongoId('546805e40eb9fb32018b45fe'),new MongoId('54671c4b0eb9fb89048b45f5')]);//其他
-           // $criteria->status('==',1);
-           // $criteria->limit(3); 
-           // $criteria->offset(rand(0,10));
-           // $cursor = self::model()->findAll($criteria);
-           // foreach ($cursor as $key => $value) {
-           //     $data[] = $value;
-           // }
+            // $criteria = new EMongoCriteria();
+            // $criteria->root_parent('notin',[new MongoId('546805e40eb9fb32018b45fe'),new MongoId('54671c4b0eb9fb89048b45f5')]);//其他
+            // $criteria->status('==',1);
+            // $criteria->limit(3);
+            // $criteria->offset(rand(0,10));
+            // $cursor = self::model()->findAll($criteria);
+            // foreach ($cursor as $key => $value) {
+            //     $data[] = $value;
+            // }
             foreach ($data as $key => $obj) {
                 $temp['id'] = (string)$obj->_id;
                 $temp['name'] = $obj->name;
@@ -493,7 +495,7 @@ class DealPet extends MongoActiveRecord {
             //$parents_info['father_hair_color']      = CommonFn::get_val_if_isset($father_info, 'hair_color', '');
             // 母亲信息
             $mother_info = CommonFn::get_val_if_isset($row, 'mother_info', []);
-           // $parents_info['mother_name']            = CommonFn::get_val_if_isset($mother_info, 'name', '');
+            // $parents_info['mother_name']            = CommonFn::get_val_if_isset($mother_info, 'name', '');
             $parents_info['mother_avatar']          = CommonFn::get_val_if_isset($mother_info, 'avatar', '');
             $parents_info['mother_breeds']          = CommonFn::get_val_if_isset($mother_info, 'breeds', '');
             //$parents_info['mother_shoulder_height'] = CommonFn::get_val_if_isset($mother_info, 'shoulder_height', 0);

www/protected/models/Kennel.php

@@ -1,4 +1,4 @@
-<?php 
+<?php
 /**
  * 商家模型
  */
@@ -48,6 +48,8 @@ class Kennel extends MongoAr {
 
     public $last_change_time;//最后一次修改时间
 
+    public $from;//数据来源   wozhua xinchong chongwushichang
+
     public static $status_option = [
         0  => ['name' => '待审核', 'wx' => 0],
         1  => ['name' => '正常',   'wx' => 1],
@@ -85,7 +87,7 @@ class Kennel extends MongoAr {
     ];
 
     public function __construct($scenario = 'insert') {
-        $this->setMongoDBComponent(Yii::app()->getComponent('cute'));
+        $this->setMongoDBComponent(Yii::app()->getComponent('deal'));
         parent::__construct($scenario);
     }
 

www/protected/services/ExcelToArrayService.php

@@ -34,13 +34,13 @@ class ExcelToArrayService extends Service
             ->setCellValue('D' . $num, '支付方式')
             //->setCellValue('G' . $num, 'charge_id')
             ->setCellValue('E' . $num, '预约时间')
-            ->setCellValue('F' . $num, '订单处理时间')
-            ->setCellValue('G' . $num, '保洁师')
-            ->setCellValue('H' . $num, '备注')
-            ->setCellValue('I' . $num, '后台备注')
-            ->setCellValue('J' . $num, '状态')
-            ->setCellValue('K'.$num,'总额')
-            ->setCellValue('L'.$num,'折后')
+            //->setCellValue('F' . $num, '订单处理时间')
+            ->setCellValue('F' . $num, '保洁师')
+            ->setCellValue('G' . $num, '备注')
+            ->setCellValue('H' . $num, '后台备注')
+            ->setCellValue('I' . $num, '状态')
+            ->setCellValue('J'.$num,'总额')
+            ->setCellValue('K'.$num,'折后')
             ;
         $num += 1;
         foreach($data as $key => $value){
@@ -65,13 +65,13 @@ class ExcelToArrayService extends Service
                 ->setCellValue('D' . $num, $value['channel'])
                // ->setCellValue('G' . $num, $value['charge_id'])
                 ->setCellValue('E' . $num, $value['booking_time_str'])
-                ->setCellValue('F' . $num, $value['deal_time_str'])
-                ->setCellValue('G' . $num, $technicians)
-                ->setCellValue('H' . $num, $value['memo'])
-                ->setCellValue('I' . $num, $value['remark'])
-                ->setCellValue('J' . $num, $value['status_str'])
-                ->setCellValue('K'.$num,$value['af_sum_price'])
-                ->setCellValue('L'.$num,$value['sum_price'])
+                //->setCellValue('F' . $num, $value['deal_time_str'])
+                ->setCellValue('F' . $num, $technicians)
+                ->setCellValue('G' . $num, $value['memo'])
+                ->setCellValue('H' . $num, $value['remark'])
+                ->setCellValue('I' . $num, $value['status_str'])
+                ->setCellValue('J'.$num,$value['af_sum_price'])
+                ->setCellValue('K'.$num,$value['sum_price'])
             ;
             $num += 1;
         }