1

www/protected/controllers/GiftController.php

@@ -55,7 +55,9 @@ class GiftController extends AdminController
         $desc = Yii::app()->request->getParam('desc','');
         $type = Yii::app()->request->getParam('type','');
         $supplier = Yii::app()->request->getParam('supplier','');
-
+        if ($type == 100) {
+            CommonFn::requestAjax(false,'请选择礼包类型');exit;
+        }
 
 
         if (!CommonFn::isMongoId($id)) {

www/protected/controllers/JRecordController.php

@@ -13,21 +13,21 @@ class JRecordController extends AdminController
     {
         $status = CommonFn::getComboboxData(JRecord::$status_options, 100, true, 100);
         $tmp = Business::model()->findAll();
-//        foreach ($tmp as $k) {
-//            $k->delete();
-//        }
-//        $tmp = JRecord::model()->findAll();
-//        foreach ($tmp as $k) {
-//            $k->delete();
-//        }
-//        $tmp = JCoupon::model()->findAll();
-//        foreach ($tmp as $k) {
-//            $k->delete();
-//        }
-//        $tmp = Gift::model()->findAll();
-//        foreach ($tmp as $k) {
-//            $k->delete();
-//        }
+        foreach ($tmp as $k) {
+            $k->delete();
+        }
+        $tmp = JRecord::model()->findAll();
+        foreach ($tmp as $k) {
+            $k->delete();
+        }
+        $tmp = JCoupon::model()->findAll();
+        foreach ($tmp as $k) {
+            $k->delete();
+        }
+        $tmp = Gift::model()->findAll();
+        foreach ($tmp as $k) {
+            $k->delete();
+        }
 
         $this->render('index',array(
             'status' => $status

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

@@ -73,7 +73,9 @@ class JRecord extends MongoAr
         $newRow['name'] = $newRow['user_info']['name'];
         $newRow['mobile'] = $newRow['user_info']['mobile'];
         $bus = Business::get(new MongoId($gift->supplier));
-        $newRow['supplier_info'] = $bus->source.'-'.$bus->name.'-'.$bus->mobile;
+        $newRow['supplier_source'] = $bus->source;
+        $newRow['supplier_name'] = $bus->name;
+        $newRow['supplier_mobile'] = $bus->mobile;
         $newRow['flow'] = CommonFn::get_val_if_isset($row,'flow','');
         $newRow['flow_number'] = CommonFn::get_val_if_isset($row,'flow_number','');
         $newRow['status'] = CommonFn::get_val_if_isset($row,'status','');

www/protected/services/JCouponService.php

@@ -34,7 +34,6 @@ class JCouponService extends Service
             ->setCellValue('A' . $num, '礼包名称')//$name
             ->setCellValue('B' . $num, '礼品券编号')//$name
             ->setCellValue('C' . $num, '提货密码')//$name
-            ->setCellValue('D' . $num, '有效期')//$sex
         ;
         $num += 1;
         foreach($data as $key => $value){
@@ -43,7 +42,6 @@ class JCouponService extends Service
                 ->setCellValue('A' . $num, $value['gift_name'])
                 ->setCellValue('B' . $num, $value['coupon_coding'])
                 ->setCellValue('C' . $num, $value['pwd_str'])
-                ->setCellValue('D' . $num, $value['expire_time_str'])
             ;
             $num += 1;
         }
@@ -51,7 +49,7 @@ class JCouponService extends Service
         $objPHPExcel->getActiveSheet()->setTitle('User');
         $objPHPExcel->setActiveSheetIndex(0);
         header('Content-Type: application/vnd.ms-excel');
-        $name = '提货记录';
+        $name = date('Y-m-d').'兑换券导出记录';
         header('Content-Disposition: attachment;filename="' . $name . '.xls"');
         header('Cache-Control: max-age=0');
         $objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5');

www/protected/services/JRecordService.php

@@ -38,6 +38,8 @@ class JRecordService extends Service
             //->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
@@ -55,7 +57,9 @@ class JRecordService extends Service
                 ->setCellValue('C' . $num, $value['coupon_coding'])
                 ->setCellValue('D' . $num, $value['name'])
                 ->setCellValue('E' . $num, $value['address'])
-                ->setCellValue('F' . $num, $value['supplier_info'])
+                ->setCellValue('F' . $num, $value['supplier_source'])
+                ->setCellValue('G' . $num, $value['supplier_name'])
+                ->setCellValue('H' . $num, $value['supplier_mobile'])
             ;
             $num += 1;
         }
@@ -63,7 +67,7 @@ class JRecordService extends Service
         $objPHPExcel->getActiveSheet()->setTitle('User');
         $objPHPExcel->setActiveSheetIndex(0);
         header('Content-Type: application/vnd.ms-excel');
-        $name = '提货记录';
+        $name = date('Y-m-d').'提货记录导出记录';
         header('Content-Disposition: attachment;filename="' . $name . '.xls"');
         header('Cache-Control: max-age=0');
         $objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5');

www/protected/views/jCoupon/index.php

@@ -22,7 +22,7 @@
                     导出批次号：<input id="start_num" />
                     <a href="#" class='easyui-linkbutton' plain="true" iconCls="icon-add" onclick="export_order();return false;">导出兑换券</a>
                 </div>
-                <div class="left">
+                <div class="left" style="border-top: 1px solid #0b0b0b">
                     <div>
                         礼品券编号起始值：<input id="start1_num" />
                         修改数量：<input id="num1" />
@@ -30,7 +30,7 @@
                     <div>
                         发行渠道：<input id="bus1"   />
                         <input id="bus_id1" type='hidden' />
-                        <a href="#" class='easyui-linkbutton' plain="true" iconCls="icon-add" onclick="confirm_data();return false;">批量修改</a>
+                        <a href="#" class='easyui-linkbutton' plain="true" iconCls="icon-add" onclick="confirm_data();return false;">批量修改渠道</a>
 
                     </div>
                 </div>