|
@@ -565,7 +565,10 @@ HTML;
|
|
|
$model = $model->where($aler . 'pay_type', 'yue');
|
|
$model = $model->where($aler . 'pay_type', 'yue');
|
|
|
break;
|
|
break;
|
|
|
case 3:
|
|
case 3:
|
|
|
- $model = $model->where($aler . 'pay_type', 'offline');
|
|
|
|
|
|
|
+ $model = $model->where($aler . 'pay_type', 'offline')->where('offline_type', 0);
|
|
|
|
|
+ break;
|
|
|
|
|
+ case 5:
|
|
|
|
|
+ $model = $model->where($aler . 'pay_type', 'offline')->where('offline_type', 1);
|
|
|
break;
|
|
break;
|
|
|
case 4:
|
|
case 4:
|
|
|
$model = $model->where($aler . 'pay_type', 'jialie');
|
|
$model = $model->where($aler . 'pay_type', 'jialie');
|
|
@@ -1369,9 +1372,12 @@ HTML;
|
|
|
$where['pay_type'] = 2;
|
|
$where['pay_type'] = 2;
|
|
|
$yue = self::getOrderWhere($where, new self)->count();
|
|
$yue = self::getOrderWhere($where, new self)->count();
|
|
|
$where['pay_type'] = 3;
|
|
$where['pay_type'] = 3;
|
|
|
- $offline = self::getOrderWhere($where, new self)->count();
|
|
|
|
|
|
|
+ $cash = self::getOrderWhere($where, new self)->count();
|
|
|
$where['pay_type'] = 4;
|
|
$where['pay_type'] = 4;
|
|
|
$jialie = self::getOrderWhere($where, new self)->count();
|
|
$jialie = self::getOrderWhere($where, new self)->count();
|
|
|
|
|
+ $where['pay_type'] = 5;
|
|
|
|
|
+ $scan = self::getOrderWhere($where, new self)->count();
|
|
|
|
|
+ $offline = $cash + $scan;
|
|
|
return compact('weixin', 'yue', 'offline', 'jialie');
|
|
return compact('weixin', 'yue', 'offline', 'jialie');
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|