Merge branch 'master' of gitee.com:yiguanjia/php

www/protected/modules/j/models/JCoupon.php

@@ -72,15 +72,15 @@ class JCoupon extends MongoAr
         $model = self::model()->findAll($criteria);
         return $model;
     }
-//    public static function getByPwdOne($pwd,$num = '') {
-//        $criteria = new EMongoCriteria();
-//        $criteria->pwd('==', $pwd);
+    public static function getByPwdOne($pwd) {
+        $criteria = new EMongoCriteria();
+        $criteria->pwd('==', $pwd);
 //        if ($num) {
 //            $criteria->coding_num('==', $num);
 //        }
-//        $model = self::model()->find($criteria);
-//        return $model;
-//    }
+        $model = self::model()->find($criteria);
+        return $model;
+    }
 
 
 

www/protected/services/JRecordService.php

@@ -35,19 +35,10 @@ class JRecordService extends Service
             ->setCellValue('B' . $num, '类型')//$phone
             ->setCellValue('C' . $num, '礼券编号')//$sex
             ->setCellValue('D' . $num, '收货人')//$address
-            //->setCellValue('G' . $num, 'charge_id')
             ->setCellValue('E' . $num, '收货地址')//$address
             ->setCellValue('F' . $num, '供货商信息')//$work_time_part
             ->setCellValue('G' . $num, '联系人')//$work_time_part
-            ->setCellValue('H' . $num, '联系方式')//$work_time_part
-            //->setCellValue('F' . $num, '订单处理时间')
-            /*->setCellValue('I' . $num, '工种')//$work_type
-            ->setCellValue('J' . $num, '服务技能')//$skill
-            ->setCellValue('K'.$num,'自述')//$readme
-            ->setCellValue('L'.$num,'状态')//$status
-            ->setCellValue('M'.$num,'备注')//$desc
-            ->setCellValue('N'.$num,'门店ID')//$store_id*/
-        ;
+            ->setCellValue('H' . $num, '联系方式');//$work_time_part
         $num += 1;
         foreach($data as $key => $value){
             $objPHPExcel->setActiveSheetIndex(0)