|
@@ -66,7 +66,7 @@ class Task
|
|
|
{
|
|
{
|
|
|
# 获取昨天的时间
|
|
# 获取昨天的时间
|
|
|
$time = \Dever\Helper\Date::day();
|
|
$time = \Dever\Helper\Date::day();
|
|
|
- $where['cdate'] = array('<', $time[0]);
|
|
|
|
|
|
|
+ $where['finish_date'] = array('<', $time[0]);
|
|
|
$where['status'] = array('>=', 10);
|
|
$where['status'] = array('>=', 10);
|
|
|
$order = Dever::db('order', 'seller')->load($where);
|
|
$order = Dever::db('order', 'seller')->load($where);
|
|
|
$data = array();
|
|
$data = array();
|
|
@@ -84,9 +84,9 @@ class Task
|
|
|
'data' => array(),
|
|
'data' => array(),
|
|
|
);
|
|
);
|
|
|
foreach ($order as $k => $v) {
|
|
foreach ($order as $k => $v) {
|
|
|
- if ($v['status'] >= 10) {
|
|
|
|
|
|
|
+ if ($v['status'] >= 10 && $v['finish_date'] > 0) {
|
|
|
# 整理这一天成功的和失败的
|
|
# 整理这一天成功的和失败的
|
|
|
- $day = \Dever\Helper\Date::mktime(date('Y-m-d 00:00:00', ($v['finish_date'] ? $v['finish_date'] : $v['cdate'])));
|
|
|
|
|
|
|
+ $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, '_1', $default, $v);
|
|
|
$this->statItem($data, $day, 'seller_' . $v['seller_id'], $default, $v, $v['channel_id']);
|
|
$this->statItem($data, $day, 'seller_' . $v['seller_id'], $default, $v, $v['channel_id']);
|
|
|
if ($v['channel_id']) {
|
|
if ($v['channel_id']) {
|
rabin