|
|
@@ -74,8 +74,11 @@ class PayDetailService
|
|
|
public static function getPayWay($groupId, $orderId)
|
|
|
{
|
|
|
$payDetails = PayDetail::where('join_pay_order_id', $groupId)
|
|
|
- ->whereJsonContains('join_pay_object_json->order_id', $orderId)
|
|
|
- ->where('pay_category', '<>', 'REFUND')
|
|
|
+ ->where(function ($query) use ($orderId) {
|
|
|
+ $query->whereJsonContains('join_pay_object_json->order_id', $orderId)
|
|
|
+ ->orWhere('join_pay_object_json', '')
|
|
|
+ ->orWhereNull('join_pay_object_json');
|
|
|
+ })->where('pay_category', '<>', 'REFUND')
|
|
|
->where('pay_status', 'SUCCESS')
|
|
|
->select('pay_id', 'pay_category', 'pay_prepayid', 'pay_paytimes', 'pay_status', 'pay_amount', 'pay_extend_json')
|
|
|
->get()
|
gorden