Browse Source

排除空支付方式记录

gorden 4 months ago
parent
commit
4dc194be36

+ 1 - 0
app/admin/controller/order/RefundController.php

@@ -484,6 +484,7 @@ class RefundController extends Curd
         $payDetail = PayDetail::where('join_pay_order_id', $order->order_groupby)
             ->whereJsonContains('join_pay_object_json->order_id', $orderId)
             ->where('pay_status', 'SUCCESS')
+            ->whereNotNull('pay_prepayid')
             ->whereIn('pay_category', ['GOODS', 'SERVICE', 'CHNMED', 'CHNNCD', 'MEALS', 'DISHES', 'VIP', 'PACKAGE'])
             ->get()
             ->toArray();

+ 1 - 0
app/admin/controller/order/WholeController.php

@@ -493,6 +493,7 @@ class WholeController extends Curd
                     $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')
+                ->whereNotNull('pay_prepayid')
                 ->select('pay_id', 'pay_category', 'pay_prepayid', 'pay_paytimes', 'pay_status', 'pay_amount', 'pay_extend_json')
                 ->get();
             if (count($payDetails) > 1) {

+ 1 - 0
app/admin/service/order/PayDetailService.php

@@ -79,6 +79,7 @@ class PayDetailService
                     ->orWhere('join_pay_object_json', '')
                     ->orWhereNull('join_pay_object_json');
             })->where('pay_category', '<>', 'REFUND')
+            ->whereNotNull('pay_prepayid')
             ->where('pay_status', 'SUCCESS')
             ->select('pay_id', 'pay_category', 'pay_prepayid', 'pay_paytimes', 'pay_status', 'pay_amount', 'pay_extend_json')
             ->get()