|
|
@@ -1993,6 +1993,14 @@ class MemberService extends BaseService
|
|
|
$datas = DrawLogModel::from('draw_logs as a')
|
|
|
->leftjoin('machine as b','b.id','=','a.machine_id')
|
|
|
->where($where)
|
|
|
+ ->where(function($query) use($params){
|
|
|
+ $type = isset($params['type'])? $params['type'] : 0;
|
|
|
+ if($type == 1){
|
|
|
+ $query->where('a.expired_at','>=', date('Y-m-d H:i:s'));
|
|
|
+ }else if ($type == 2){
|
|
|
+ $query->where('a.expired_at','<', date('Y-m-d H:i:s'));
|
|
|
+ }
|
|
|
+ })
|
|
|
->select($field)
|
|
|
->orderBy('a.create_time', 'desc')
|
|
|
->orderBy('a.expired_at', 'desc')
|
