|
|
@@ -92,6 +92,11 @@ class TradeService extends BaseService
|
|
|
->leftJoin('shop as s', 's.id', '=', 'g.shop_id')
|
|
|
->where($where)
|
|
|
->where('a.status','>', 0)
|
|
|
+ ->where(function($query) use($userId,$status){
|
|
|
+ if($status == 2){
|
|
|
+ $query->whereNotIn('a.user_id',[$userId]);
|
|
|
+ }
|
|
|
+ })
|
|
|
->where(function($query) use($type){
|
|
|
if($type){
|
|
|
$query->where('a.create_time','>=', strtotime(date('Y-m-d')));
|