|
@@ -84,11 +84,11 @@ class MemberCouponService extends BaseService
|
|
|
$total = isset($params['total'])?$params['total']:0;
|
|
$total = isset($params['total'])?$params['total']:0;
|
|
|
if($total){
|
|
if($total){
|
|
|
$query->where(function($query) use($total){
|
|
$query->where(function($query) use($total){
|
|
|
- $query->where(function($query) use($total){
|
|
|
|
|
- $query->where('a.coupon_type',10)
|
|
|
|
|
|
|
+ $query->whereIn('a.coupon_type',[20,30])
|
|
|
|
|
+ ->orWhere(function($query) use($total){
|
|
|
|
|
+ $query->where('a.coupon_type','=',10)
|
|
|
->where('a.min_price','<=', $total);
|
|
->where('a.min_price','<=', $total);
|
|
|
- })
|
|
|
|
|
- ->orWhereIn('a.coupon_type',[20,30]);
|
|
|
|
|
|
|
+ });
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|