rabin hace 1 año
padre
commit
0a49c25395
Se han modificado 1 ficheros con 31 adiciones y 20 borrados
  1. 31 20
      src/dai/seller/api/Task.php

+ 31 - 20
src/dai/seller/api/Task.php

@@ -60,15 +60,36 @@ class Task
         }
     }
 
-    # 每日整理订单数据,删除,并统计订单数据
-    public function stat_commit(){}
-    public function stat()
+    # 每日整理订单数据
+    public function order_commit(){}
+    public function order()
     {
         # 获取昨天的时间
         $time = \Dever\Helper\Date::day();
-        $where['finish_date'] = array('<', $time[0]);
+        $where['cdate'] = array('<', $time[0]);
         $where['status'] = array('>=', 10);
         $order = Dever::db('order', 'seller')->load($where);
+        foreach ($order as $k => $v) {
+            if ($v['status'] >= 10 && $v['finish_date'] > 0) {
+                $info = Dever::db('order_bak', 'seller')->find($v['id']);
+                if (!$info) {
+                    $info = Dever::db('order_bak', 'seller')->insert($v);
+                }
+                if ($info) {
+                    Dever::db('order', 'seller')->delete($v['id']);
+                }
+            }
+        }
+    }
+
+    # 统计
+    public function stat()
+    {
+        # 获取昨天的时间
+        $time = \Dever\Helper\Date::day(1);
+        $where['cdate'] = array('>=', $time[0]);
+        $where['#cdate'] = array('<=', $time[1]);
+        $order = Dever::db('order_bak', 'seller')->load($where);
         $data = array();
         $default = array
         (
@@ -84,22 +105,12 @@ class Task
             'data' => array(),
         );
         foreach ($order as $k => $v) {
-            if ($v['status'] >= 10 && $v['finish_date'] > 0) {
-                # 整理这一天成功的和失败的
-                $day = \Dever\Helper\Date::mktime(date('Y-m-d 00:00:00', $v['finish_date']));
-                $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']);
-                }
-
-                $info = Dever::db('order_bak', 'seller')->find($v['id']);
-                if (!$info) {
-                    $info = Dever::db('order_bak', 'seller')->insert($v);
-                }
-                if ($info) {
-                    Dever::db('order', 'seller')->delete($v['id']);
-                }
+            # 整理这一天成功的和失败的
+            $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']);
             }
         }