north 8 년 전
부모
커밋
93c1f355fb

+ 29 - 0
www/protected/controllers/ROrderController.php

@@ -1072,6 +1072,35 @@ class ROrderController extends AdminController{
         echo "导出成功";
     }
 
+    public function actionLoad()
+    {
+
+
+        $excelFile = '/var/www/1.xlsx';//获取文件名
+        //这里就是导入PHPExcel包了,要用的时候就加这么两句,方便吧
+        Yii::$enableIncludePath = false;
+        Yii::import('application.extensions.PHPExcel.PHPExcel', 1);
+        $phpexcel = new PHPExcel;
+        //$excelReader = PHPExcel_IOFactory::createReader('Excel5');
+        $excelReader = PHPExcel_IOFactory::createReader('Excel2007');
+        $phpexcel = $excelReader->load($excelFile)->getSheet(0);//载入文件并获取第一个sheet
+
+        $total_line = $phpexcel->getHighestRow();
+        $total_column = $phpexcel->getHighestColumn();
+
+        for ($row = 2; $row <= $total_line; $row++) {
+            $data = array();
+            for ($column = 'A'; $column <= $total_column; $column++) {
+                $data[] = trim($phpexcel->getCell($column . $row)->getValue());
+            }
+            var_dump($data);
+            echo '<br/>';
+        }
+
+    }
+
+
+
 
 
 }

+ 1 - 0
www/protected/modules/o2o/controllers/OrderController.php

@@ -966,6 +966,7 @@ class  OrderController extends O2oBaseController{
         $data['result'] = $parsedRows;
         $data['total'] = $total;
         echo CommonFn::requestAjax(true,$data);
+        time();
     }
 
 }

+ 3 - 1
www/protected/modules/o2o/controllers/RechargeController.php

@@ -65,7 +65,9 @@ class  RechargeController extends O2oBaseController{
         if(!$recharge){
             CommonFn::requestAjax(false,CommonFn::getMessage('message','params_illegal'));
         }
-
+        if($recharge->denomination == 0 ){
+            $recharge->denomination = Yii::app()->request->getParam('value','');
+        }
         $order = new RechargeOrder();
         $order->time = time();
 

+ 1 - 0
www/protected/services/ExcelToArrayService.php

@@ -106,4 +106,5 @@ class ExcelToArrayService extends Service
         $objWriter->save('php://output');
         exit;
     }
+
 }

+ 1 - 0
www/protected/views/rOrder/index.php

@@ -1605,4 +1605,5 @@
             $('#resetTecName').val('');
         }
     }
+
 </script>