edit

src/dai/seller/api/Task.php

@@ -74,30 +74,24 @@ class Task
         $order = Dever::db('order', 'seller')->select($where);
         foreach ($order as $k => $v) {
             if ($v['status'] == 10 && $v['finish_date'] > 0) {
-
-                $info = Dever::db('order_log1', 'seller')->find(array('order_num' => $v['order_num']));
-                if (!$info) {
-                    unset($v['id']);
-                    $info = Dever::db('order_log1', 'seller')->insert($v);
-                }
+                unset($v['id']);
+                $id = $v['id'];
+                $info = Dever::db('order_log1', 'seller')->insert($v);
                 if ($info) {
-                    Dever::db('order', 'seller')->delete($v['id']);
-                }
-
-                /*
-                $info = Dever::db('order_bak', 'seller')->find(array('order_num' => $v['order_num']));
-                if (!$info) {
-                    $info = Dever::db('order_bak', 'seller')->insert($v);
+                    Dever::db('order', 'seller')->delete($id);
                 }
+            }
+        }
+        $where['status'] = 11;
+        $order = Dever::db('order_log2', 'seller')->select($where);
+        foreach ($order as $k => $v) {
+            if ($v['status'] == 10 && $v['finish_date'] > 0) {
+                unset($v['id']);
+                $id = $v['id'];
+                $info = Dever::db('order_log1', 'seller')->insert($v);
                 if ($info) {
-                    $info = Dever::db('order_log1', 'seller')->find(array('order_num' => $v['order_num']));
-                    if (!$info) {
-                        $info = Dever::db('order_log1', 'seller')->insert($v);
-                    }
-                    if ($info) {
-                        Dever::db('order', 'seller')->delete($v['id']);
-                    }
-                }*/
+                    Dever::db('order_log2', 'seller')->delete($id);
+                }
             }
         }
         $this->cash();
@@ -117,7 +111,6 @@ class Task
         $where['cdate'] = array('>=', $time[0]);
         $where['cdate#'] = array('<=', $time[1]);
         $order = Dever::db('order_log1', 'seller')->select($where);
-        $error_order = Dever::db('order_log2', 'seller')->select($where);
         $data = array();
         $default = array
         (
@@ -142,16 +135,6 @@ class Task
             }
         }
 
-        foreach ($error_order as $k => $v) {
-            # 整理这一天成功的和失败的
-            $day = \Dever\Helper\Date::mktime(date('Y-m-d 00:00:00', $v['cdate']));
-            $this->statItem($data, $day, '_1', $default, $v);
-            $this->statItem($data, $day, 'seller_' . $v['seller_id'], $default, $v, $v['channel_id']);
-            if ($v['channel_id']) {
-                $this->statItem($data, $day, 'channel_' . $v['channel_id'], $default, $v, $v['seller_id']);
-            }
-        }
-
         if ($data) {
             foreach ($data as $k => $v) {
                 foreach ($v as $k1 => $v1) {
@@ -336,17 +319,17 @@ class Task
     public function fail_1()
     {
         $where['status'] = 11;
-        $order = Dever::db('order_log1', 'seller')->select($where);
+        $order = Dever::db('order_log2', 'seller')->select($where);
         if ($order) {
             foreach ($order as $k => $v) {
                 $id = $v['id'];
                 unset($v['id']);
-                $info = Dever::db('order_log2', 'seller')->find(array('order_num' => $v['order_num']));
+                $info = Dever::db('order_log1', 'seller')->find(array('order_num' => $v['order_num']));
                 if (!$info) {
-                    $info = Dever::db('order_log2', 'seller')->insert($v);
+                    $info = Dever::db('order_log1', 'seller')->insert($v);
                 }
                 if ($info) {
-                    Dever::db('order_log1', 'seller')->delete($id);
+                    Dever::db('order_log2', 'seller')->delete($id);
                 }
             }
         }

src/dai/seller/table/manage/core.php

@@ -1,187 +1,187 @@
-<?php
-return array
-(
-    # 系统模块定义 这里定义商户管理系统
-    'module' => array
-    (
-        'seller' => array
-        (
-            'name' => '商户',
-            'sort' => '1',
-            'system' => 'group',
-            'data_table' => 'seller/info',
-        ),
-    ),
-
-    'menu' => array
-    (
-        'seller_data' => array
-        (
-            'name' => '数据',
-            'icon' => 'database-line',
-            'sort' => '1',
-            'module' => 'seller',
-        ),
-        'seller_order' => array
-        (
-            'parent' => 'seller_data',
-            'name' => '订单管理',
-            'icon' => 'order-play-line',
-            'sort' => '1',
-        ),
-        'seller_order_list' => array
-        (
-            'parent'    => 'seller_order',
-            'name'      => '今日订单',
-            'icon'      => 'album-line',
-            'sort'      => '1',
-        ),
-        /*
-        'seller_order_log_list' => array
-        (
-            'parent'    => 'seller_order',
-            'name'      => '已完成订单',
-            'icon'      => 'bank-card-line',
-            'sort'      => '2',
-        ),*/
-        'seller_order_log_list' => array
-        (
-            'parent'    => 'seller_order',
-            'name'      => '历史订单',
-            'icon'      => 'bank-card-line',
-            'sort'      => '2',
-        ),
-        'seller_order_log2_list' => array
-        (
-            'parent'    => 'seller_order',
-            'name'      => '失败订单',
-            'icon'      => 'mickey-line',
-            'sort'      => '3',
-        ),
-        'seller_order_push' => array
-        (
-            'parent'    => 'seller_order',
-            'name'      => '手动充值',
-            'icon'      => 'bank-card-line',
-            'sort'      => '4',
-            'show'      => 3,
-        ),
-        'seller_log' => array
-        (
-            'parent'    => 'seller_data',
-            'name'      => '账户管理',
-            'icon'      => 'mickey-line',
-            'sort'      => '2',
-        ),
-        'seller_log_list' => array
-        (
-            'parent'    => 'seller_log',
-            'name'      => '钱包流水',
-            'icon'      => 'article-line',
-            'sort'      => '1',
-        ),
-
-        'dealer' => array
-        (
-            'parent' => 'dai',
-            'name' => '经销商',
-            'icon' => 'exchange-line',
-            'sort' => '1',
-        ),
-        'info' => array
-        (
-            'parent'    => 'dealer',
-            'name'      => '商户管理',
-            'icon'      => 'mickey-line',
-            'sort'      => '1',
-        ),
-        'log' => array
-        (
-            'parent'    => 'dealer',
-            'name'      => '资金日志',
-            'icon'      => 'article-line',
-            'sort'      => '2',
-            'show'      => 3,
-        ),
-        'data' => array
-        (
-            'name' => '数据',
-            'icon' => 'database-line',
-            'sort' => '1',
-            'module' => 'platform',
-        ),
-        'order' => array
-        (
-            'parent' => 'data',
-            'name' => '订单管理',
-            'icon' => 'order-play-line',
-            'sort' => '1',
-        ),
-        'order_list' => array
-        (
-            'parent'    => 'order',
-            'name'      => '今日订单',
-            'icon'      => 'album-line',
-            'sort'      => '1',
-        ),
-        /*
-        'order_log_list' => array
-        (
-            'parent'    => 'order',
-            'name'      => '已完成订单',
-            'icon'      => 'bank-card-line',
-            'sort'      => '2',
-        ),*/
-        'order_log_list' => array
-        (
-            'parent'    => 'order',
-            'name'      => '历史订单',
-            'icon'      => 'bank-card-line',
-            'sort'      => '2',
-        ),
-        'order_log2_list' => array
-        (
-            'parent'    => 'order',
-            'name'      => '失败订单',
-            'icon'      => 'mickey-line',
-            'sort'      => '3',
-        ),
-        'order_push' => array
-        (
-            'parent'    => 'order',
-            'name'      => '手动充值',
-            'icon'      => 'bank-card-line',
-            'sort'      => '4',
-            'show'      => 3,
-        ),
-
-        'stat' => array
-        (
-            'parent' => 'data',
-            'name' => '数据统计',
-            'icon' => 'database-line',
-            'sort' => '2',
-        ),
-        'order_stat' => array
-        (
-            'parent'    => 'stat',
-            'name'      => '平台订单统计',
-            'icon'      => 'cloud-windy-line',
-            'sort'      => '1',
-        ),
-        'order_stat_seller' => array
-        (
-            'parent'    => 'stat',
-            'name'      => '商户订单统计',
-            'icon'      => 'cloudy-2-line',
-            'sort'      => '2',
-        ),
-        'order_stat_channel' => array
-        (
-            'parent'    => 'stat',
-            'name'      => '渠道订单统计',
-            'icon'      => 'cloudy-line',
-            'sort'      => '3',
-        ),
-    ),
+<?php
+return array
+(
+    # 系统模块定义 这里定义商户管理系统
+    'module' => array
+    (
+        'seller' => array
+        (
+            'name' => '商户',
+            'sort' => '1',
+            'system' => 'group',
+            'data_table' => 'seller/info',
+        ),
+    ),
+
+    'menu' => array
+    (
+        'seller_data' => array
+        (
+            'name' => '数据',
+            'icon' => 'database-line',
+            'sort' => '1',
+            'module' => 'seller',
+        ),
+        'seller_order' => array
+        (
+            'parent' => 'seller_data',
+            'name' => '订单管理',
+            'icon' => 'order-play-line',
+            'sort' => '1',
+        ),
+        'seller_order_list' => array
+        (
+            'parent'    => 'seller_order',
+            'name'      => '今日订单',
+            'icon'      => 'album-line',
+            'sort'      => '1',
+        ),
+        /*
+        'seller_order_log_list' => array
+        (
+            'parent'    => 'seller_order',
+            'name'      => '已完成订单',
+            'icon'      => 'bank-card-line',
+            'sort'      => '2',
+        ),*/
+        'seller_order_log_list' => array
+        (
+            'parent'    => 'seller_order',
+            'name'      => '历史订单',
+            'icon'      => 'bank-card-line',
+            'sort'      => '3',
+        ),
+        'seller_order_log2_list' => array
+        (
+            'parent'    => 'seller_order',
+            'name'      => '失败订单',
+            'icon'      => 'mickey-line',
+            'sort'      => '2',
+        ),
+        'seller_order_push' => array
+        (
+            'parent'    => 'seller_order',
+            'name'      => '手动充值',
+            'icon'      => 'bank-card-line',
+            'sort'      => '4',
+            'show'      => 3,
+        ),
+        'seller_log' => array
+        (
+            'parent'    => 'seller_data',
+            'name'      => '账户管理',
+            'icon'      => 'mickey-line',
+            'sort'      => '2',
+        ),
+        'seller_log_list' => array
+        (
+            'parent'    => 'seller_log',
+            'name'      => '钱包流水',
+            'icon'      => 'article-line',
+            'sort'      => '1',
+        ),
+
+        'dealer' => array
+        (
+            'parent' => 'dai',
+            'name' => '经销商',
+            'icon' => 'exchange-line',
+            'sort' => '1',
+        ),
+        'info' => array
+        (
+            'parent'    => 'dealer',
+            'name'      => '商户管理',
+            'icon'      => 'mickey-line',
+            'sort'      => '1',
+        ),
+        'log' => array
+        (
+            'parent'    => 'dealer',
+            'name'      => '资金日志',
+            'icon'      => 'article-line',
+            'sort'      => '2',
+            'show'      => 3,
+        ),
+        'data' => array
+        (
+            'name' => '数据',
+            'icon' => 'database-line',
+            'sort' => '1',
+            'module' => 'platform',
+        ),
+        'order' => array
+        (
+            'parent' => 'data',
+            'name' => '订单管理',
+            'icon' => 'order-play-line',
+            'sort' => '1',
+        ),
+        'order_list' => array
+        (
+            'parent'    => 'order',
+            'name'      => '今日订单',
+            'icon'      => 'album-line',
+            'sort'      => '1',
+        ),
+        /*
+        'order_log_list' => array
+        (
+            'parent'    => 'order',
+            'name'      => '已完成订单',
+            'icon'      => 'bank-card-line',
+            'sort'      => '2',
+        ),*/
+        'order_log_list' => array
+        (
+            'parent'    => 'order',
+            'name'      => '历史订单',
+            'icon'      => 'bank-card-line',
+            'sort'      => '3',
+        ),
+        'order_log2_list' => array
+        (
+            'parent'    => 'order',
+            'name'      => '失败订单',
+            'icon'      => 'mickey-line',
+            'sort'      => '2',
+        ),
+        'order_push' => array
+        (
+            'parent'    => 'order',
+            'name'      => '手动充值',
+            'icon'      => 'bank-card-line',
+            'sort'      => '4',
+            'show'      => 3,
+        ),
+
+        'stat' => array
+        (
+            'parent' => 'data',
+            'name' => '数据统计',
+            'icon' => 'database-line',
+            'sort' => '2',
+        ),
+        'order_stat' => array
+        (
+            'parent'    => 'stat',
+            'name'      => '平台订单统计',
+            'icon'      => 'cloud-windy-line',
+            'sort'      => '1',
+        ),
+        'order_stat_seller' => array
+        (
+            'parent'    => 'stat',
+            'name'      => '商户订单统计',
+            'icon'      => 'cloudy-2-line',
+            'sort'      => '2',
+        ),
+        'order_stat_channel' => array
+        (
+            'parent'    => 'stat',
+            'name'      => '渠道订单统计',
+            'icon'      => 'cloudy-line',
+            'sort'      => '3',
+        ),
+    ),
 );