|
@@ -1,6 +1,9 @@
|
|
|
<?php
|
|
|
+
|
|
|
+use task\manager;
|
|
|
+
|
|
|
require_once(BASE_ROOT_PATH . '/mobile/control/merchantweb.php');
|
|
|
-require_once(BASE_HELPER_PATH . '/task/task_helper.php');
|
|
|
+//require_once(BASE_HELPER_PATH . '/task/task_helper.php');
|
|
|
|
|
|
class merchant_orderControl extends mbMerchantControl
|
|
|
{
|
|
@@ -456,10 +459,11 @@ class merchant_orderControl extends mbMerchantControl
|
|
|
return self::outerr(errcode::ErrInputParam, "筛选日期类型错误.");
|
|
|
}
|
|
|
$task_title = $task_title_create($start, $end, $time_type);
|
|
|
- $manager = new task\manager();
|
|
|
$cond = ['normal' => $normal_cond, 'time_scope' => $scope, 'export_type' => 'merchant'];
|
|
|
|
|
|
- $task = $manager->add_task('refill_order_export',$cond,1,-1, $task_title, $this->mchid());
|
|
|
+ $task = manager::add_task('refill_order_export',$cond,1,-1, $task_title, $this->mchid());
|
|
|
+// $manager = new task\manager();
|
|
|
+// $task = $manager->add_task('refill_order_export',$cond,1,-1, $task_title, $this->mchid());
|
|
|
$file_path = '';
|
|
|
if ($task->completed() && $task->success()) {
|
|
|
$file_name = $task->result();
|