rabin пре 1 година
родитељ
комит
c0c89553f1

+ 13 - 3
src/dai/seller/api/Task.php

@@ -63,7 +63,7 @@ class Task
     }
 
     # 每日整理订单数据
-    public function order_commit(){}
+    //public function order_commit(){}
     public function order()
     {
         # 获取昨天的时间
@@ -73,6 +73,16 @@ 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) {
+                    $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);
@@ -85,7 +95,7 @@ class Task
                     if ($info) {
                         Dever::db('order', 'seller')->delete($v['id']);
                     }
-                }
+                }*/
             }
         }
     }
@@ -103,7 +113,7 @@ class Task
         
         $where['cdate'] = array('>=', $time[0]);
         $where['#cdate'] = array('<=', $time[1]);
-        $order = Dever::db('order_bak', 'seller')->load($where);
+        $order = Dever::db('order_log1', 'seller')->load($where);
         $data = array();
         $default = array
         (

+ 1 - 1
src/dai/seller/table/manage/order_log_list.php

@@ -4,7 +4,7 @@ return array
 (
     //'source' => 'seller/order_log',
     'source' => 'seller/order_bak',
-    //'source' => 'seller/order_log1',
+    'source' => 'seller/order_log1',
     'list' => array
     (
         //'expand' => 'seller/manage.showOrderExpand',

+ 1 - 1
src/dai/seller/table/manage/seller_order_log_list.php

@@ -5,7 +5,7 @@ return array
 (
     //'source' => 'seller/order_log',
     'source' => 'seller/order_bak',
-    //'source' => 'seller/order_log1',
+    'source' => 'seller/order_log1',
     'list' => array
     (
         'where' => array('seller_id' => $seller_id),