Explorar el Código

支付记录调整

gorden hace 4 meses
padre
commit
103a0ccaae
Se han modificado 1 ficheros con 3 adiciones y 2 borrados
  1. 3 2
      app/admin/controller/order/WholeController.php

+ 3 - 2
app/admin/controller/order/WholeController.php

@@ -463,8 +463,9 @@ class WholeController extends Curd
             $order->sheet_amount = number_format($sheetAmount, 2);
 
             $payDetails = PayDetail::where('join_pay_order_id', $order->order_groupby)
-                ->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', '');
+                })->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();