fix(subscription): syncable filter excludes sync failed orders
This commit is contained in:
@@ -168,10 +168,12 @@ class SiteSubscriptionController extends Controller
|
|||||||
->whereRaw("JSON_EXTRACT(meta, '$.subscription_activation.subscription_id') IS NULL")
|
->whereRaw("JSON_EXTRACT(meta, '$.subscription_activation.subscription_id') IS NULL")
|
||||||
->whereRaw("JSON_EXTRACT(meta, '$.subscription_activation_error.message') IS NULL");
|
->whereRaw("JSON_EXTRACT(meta, '$.subscription_activation_error.message') IS NULL");
|
||||||
} elseif ($orderSyncStatus === 'syncable') {
|
} elseif ($orderSyncStatus === 'syncable') {
|
||||||
|
// 口径对齐平台订单页:可同步 = 已支付 + 已生效 + 未同步 + 非失败
|
||||||
$displayOrdersQuery
|
$displayOrdersQuery
|
||||||
->where('payment_status', 'paid')
|
->where('payment_status', 'paid')
|
||||||
->where('status', 'activated')
|
->where('status', 'activated')
|
||||||
->whereRaw("JSON_EXTRACT(meta, '$.subscription_activation.subscription_id') IS NULL");
|
->whereRaw("JSON_EXTRACT(meta, '$.subscription_activation.subscription_id') IS NULL")
|
||||||
|
->whereRaw("JSON_EXTRACT(meta, '$.subscription_activation_error.message') IS NULL");
|
||||||
}
|
}
|
||||||
|
|
||||||
$platformOrders = $displayOrdersQuery
|
$platformOrders = $displayOrdersQuery
|
||||||
|
|||||||
Reference in New Issue
Block a user