activity
This commit is contained in:
parent
d04ce73cbf
commit
ed7bb48158
@ -709,7 +709,7 @@ class ActivityController extends Controller
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function getUftxActivities(Request $request)
|
function getUftxActivities()
|
||||||
{
|
{
|
||||||
if (config('app.env') == 'production') {
|
if (config('app.env') == 'production') {
|
||||||
$merchant_id = 44;
|
$merchant_id = 44;
|
||||||
@ -751,7 +751,7 @@ class ActivityController extends Controller
|
|||||||
->where('community_activities.status', 1)
|
->where('community_activities.status', 1)
|
||||||
->where('merchant_services.type', 'community')
|
->where('merchant_services.type', 'community')
|
||||||
->where("start_time", ">", $time)
|
->where("start_time", ">", $time)
|
||||||
->where('merchant_services.merchant_id', $request->merchant_id)
|
->where('merchant_services.merchant_id', $merchant_id)
|
||||||
->orderBy('merchant_services.status', 'desc')
|
->orderBy('merchant_services.status', 'desc')
|
||||||
->orderBy('merchant_services.is_top', 'desc')
|
->orderBy('merchant_services.is_top', 'desc')
|
||||||
->orderBy('merchant_services.top_time', 'desc')
|
->orderBy('merchant_services.top_time', 'desc')
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user