|
|
@@ -461,10 +461,9 @@ class WholeController extends Curd
|
|
|
$item['member_info']['member_info_headimg'] = MemberService::getAvatarUrl(!empty($item['member_info']) && !empty($item['member_info']['member_info_headimg']) ? $item['member_info']['member_info_headimg'] : '');
|
|
|
}
|
|
|
$order->sheet_amount = number_format($sheetAmount, 2);
|
|
|
-
|
|
|
$payDetails = PayDetail::where('join_pay_order_id', $order->order_groupby)
|
|
|
->where(function ($query) use ($orderId) {
|
|
|
- $query->whereJsonContains('join_pay_object_json->order_id', $orderId)->orWhere('join_pay_object_json', '');
|
|
|
+ $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')
|
gorden