north 7 年之前
父节点
当前提交
6c32280c80
共有 2 个文件被更改,包括 5 次插入3 次删除
  1. 2 2
      www/protected/controllers/JRecordController.php
  2. 3 1
      www/protected/services/JCouponService.php

+ 2 - 2
www/protected/controllers/JRecordController.php

@@ -121,8 +121,8 @@ class JRecordController extends AdminController
         $start_time = Yii::app()->request->getParam('start_time','');
         $end_time = Yii::app()->request->getParam('end_time','');
         $criteria = new EMongoCriteria();
-        $criteria->addCond('time','>=',strtotime($start_time));
-        $criteria->addCond('time','<=',strtotime($end_time));
+        $criteria->addCond('time','>=',strtotime(date('Y-m-d 00:00:00',strtotime($start_time))));
+        $criteria->addCond('time','<=',strtotime(date('Y-m-d 23:59:59',strtotime($start_time))));
         $cursor = JRecord::model()->findAll($criteria);
 
 

+ 3 - 1
www/protected/services/JCouponService.php

@@ -18,6 +18,7 @@ class JCouponService extends Service
         error_reporting(E_ALL);
         date_default_timezone_set('Asia/Shanghai');
         $channel_option = ROrder::$channel_option;
+        $gift_name = '';
         $objPHPExcel = new PHPExcel();
         /*以下是一些设置 ,什么作者  标题啊之类的*/
         $objPHPExcel->getProperties()->setCreator("north")
@@ -37,6 +38,7 @@ class JCouponService extends Service
         ;
         $num += 1;
         foreach($data as $key => $value){
+            $gift_name = $value['gift_name'];
             $objPHPExcel->setActiveSheetIndex(0)
                 //Excel的第A列,uid是你查出数组的键值,下面以此类推
                 ->setCellValue('A' . $num, $value['gift_name'])
@@ -49,7 +51,7 @@ class JCouponService extends Service
         $objPHPExcel->getActiveSheet()->setTitle('User');
         $objPHPExcel->setActiveSheetIndex(0);
         header('Content-Type: application/vnd.ms-excel');
-        $name = date('Y-m-d').'兑换券导出记录';
+        $name = date('Y-m-d-H-').$gift_name.'兑换券导出记录';
         header('Content-Disposition: attachment;filename="' . $name . '.xls"');
         header('Cache-Control: max-age=0');
         $objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5');