refill task

admin/control/orderstats.php

@@ -151,7 +151,7 @@ class orderstatsControl extends SystemControl
         }
         $task_list = $model->getList($condition, 50);
         foreach ($task_list as $key => $value) {
-            $task_list[$key]['condition'] = unserialize($value['task_condition']);
+            $task_list[$key]['condition'] = unserialize($value['task_params']);
         }
 
         Tpl::output('list', $task_list);

admin/control/refill_order.php

@@ -187,23 +187,23 @@ class refill_orderControl extends SystemControl
                 unset($condition['vr_order.add_time']);
             }
         }
-        $result = Model('refill_order')->getAllOrders($condition);
-        $this->createExcel($result);
-
-//        $hash = $this->task_hash_check($condition, 'order_export');
-//
-//        $insert['task_type'] = 'order_export';
-//        $insert['add_time'] = time();
-//        $insert['task_hash'] = $hash;
-//        $insert['task_params'] = serialize($condition);
-//
-//        $model = Model('refill_task');
-//        $resp = $model->insert($insert);
-//        if($resp) {
-//            showMessage('录入成功', 'index.php?act=OrderStats&&op=refill_task');
-//        }else{
-//            showMessage('任务添加失败');
-//        }
+//        $result = Model('refill_order')->getAllOrders($condition);
+//        $this->createExcel($result);
+
+        $hash = $this->task_hash_check($condition, 'order_export');
+
+        $insert['task_type'] = 'order_export';
+        $insert['add_time'] = time();
+        $insert['task_hash'] = $hash;
+        $insert['task_params'] = serialize($condition);
+
+        $model = Model('refill_task');
+        $resp = $model->insert($insert);
+        if($resp) {
+            showMessage("录入成功,任务ID:{$resp}", 'index.php?act=OrderStats&&op=refill_task');
+        }else{
+            showMessage('任务添加失败');
+        }
     }
 
     private function createExcel($data = array())

admin/templates/default/refill.task.php

@@ -174,22 +174,20 @@
                     <td class="align-center"><?php echo $value['task_id']; ?></td>
                     <td class="align-center"><?php echo $output['task_type'][$value['task_type']]; ?></td>
                     <td class="align-center">
-                        <p>统计日期类型:<?php echo $output['order_time_type'][$value['condition']['order_time_type']];?></p>
-                        <p>
-                            统计日期范围:<?php echo date("Y-m-d H:i:s", $value['condition']['start_unixtime'])?>
-                            <?php if (!empty($value['condition']['end_unixtime'])) {
-                                echo '~' . date("Y-m-d H:i:s", $value['condition']['end_unixtime']);
-                            }
-                            ?>
-                        </p>
-                        <p>订单状态:
-                            <?php if ($value['condition']['order_state'] === '') {
-                                echo '/';
-                            } else {
-                                echo orderState($value['condition']);
-                            }
-                            ?>
-                        </p>
+<!--                        --><?php //if(!empty($value['condition']['refill_order.order_time'])) { ?>
+<!--                        <p>统计日期范围:-->
+<!--                            --><?php //echo date("Y-m-d H:i:s", $value['condition']['refill_order.order_time'][0][1]) ?? '/';?>
+<!--                            ~--><?php //echo date("Y-m-d H:i:s", $value['condition']['refill_order.order_time'][1][1]) ?? '/';?>
+<!--                        --><?php //}?>
+<!---->
+<!--                        <p>订单状态:-->
+<!--                            --><?php //if ($value['condition']['order_state'] === '') {
+//                                echo '/';
+//                            } else {
+//                                echo orderState($value['condition']);
+//                            }
+//                            ?>
+<!--                        </p>-->
                     </td>
                     <td class="align-center"><?php echo $output['task_state'][$value['task_state']]; ?></td>
                     <td class="align-center"><?php echo $value['add_time'] ? date('Y-m-d H:i:s', $value['add_time']) : '/'; ?></td>

data/model/refill_task.model.php

@@ -28,11 +28,10 @@ class refill_taskModel extends Model
         return empty($this->where($condition)->find());
     }
 
-    public function UnDispose($task_type): array
+    public function UnDispose(): array
     {
         $condition['is_del'] = 0;
         $condition['task_state'] = 1;
-        $condition['task_type'] = $task_type;
         $task = $this->where($condition)->order('add_time asc')->find();
         if (empty($task)) return [];
         return $task;

test/TestExportOrder.php

@@ -78,10 +78,25 @@ class TestExportOrder extends TestCase
     {
         $model_refill_task = Model('refill_task');
 
-        $task = $model_refill_task->UnDispose('order_export');
+        $task = $model_refill_task->UnDispose();
         if (empty($task)) return false;
 
         $task_id = $task['task_id'];
+        switch ($task['task_type']) {
+            case 'order_export' :
+                $result = $this->TaskOrderExport($task,$model_refill_task);
+                break;
+            default:
+                $result = '任务类型匹配失败';
+                break;
+        }
+        Log::record("refill task result：{$result}, task_id：{$task_id}");
+        return true;
+    }
+
+    private function TaskOrderExport($task,$model_refill_task)
+    {
+        $task_id = $task['task_id'];
         $task_params = unserialize($task['task_params']);
         if (empty($task_params)) {
             Log::record("refill task condition unserialize err, task_id：{$task_id}");
@@ -95,7 +110,7 @@ class TestExportOrder extends TestCase
         } else {
             $model_refill_task->DisposeErr($task_id, $task_result);
         }
-        return true;
+        return $state;
     }
 
     /**
@@ -109,21 +124,11 @@ class TestExportOrder extends TestCase
         }
 
         $merchants = [];
-        $column_values = ['平台单号', '面额', '充值卡号', '充值卡类型', '下单日期', '完成日期', '官方流水号', '订单状态', '扣款金额'];
-        $data_keys = ['order_sn', 'refill_amount', 'card_no', 'card_type_text', 'order_time_text', 'notify_time_text', 'official_sn', 'order_state_text'];
-        if (!empty($condition['refill_order.mchid'])) {
-            $merchant_list = Model('')->table('merchant')->limit(1000)->order('company_name asc')->select();
-            foreach ($merchant_list as $value) {
-                $merchants[$value['mchid']] = $value;
-            }
-            $column_values = array_merge(['商户号', '商户名称', '商户订单号'], $column_values);
-            $data_keys = array_merge(['mchid', 'mch_name', 'mch_order'], $data_keys, 'mch_amount');
-        } elseif (!empty($condition['vr_order.store_id'])) {
-            $column_values = array_merge(['上游名称','上游订单号'], $column_values);
-            $data_keys = array_merge(['channel_name', 'ch_trade_no'], $data_keys, 'channel_amount');
-        } else {
-            $column_values = array_merge([], $column_values);
-            $data_keys = array_merge([], $data_keys);
+        $column_values = ['商户号', '商户名称', '商户订单号','平台单号', '面额', '充值卡号', '充值卡类型', '下单日期', '完成日期', '官方流水号', '订单状态', '扣款金额（下游）', '上游名称','上游订单号', '折扣金额（上游）'];
+        $data_keys = ['mchid', 'mch_name', 'mch_order', 'order_sn', 'refill_amount', 'card_no', 'card_type_text', 'order_time_text', 'notify_time_text', 'official_sn', 'order_state_text', 'mch_amount', 'channel_name', 'ch_trade_no', 'channel_amount'];
+        $merchant_list = Model('')->table('merchant')->limit(1000)->order('company_name asc')->select();
+        foreach ($merchant_list as $value) {
+            $merchants[$value['mchid']] = $value;
         }
         $column_key = 'A';
         for($index=0;$index<count($column_values);$index++){