Browse Source

收支表调整

gorden 4 months ago
parent
commit
5250364a86

+ 4 - 4
app/admin/controller/order/RefundController.php

@@ -571,10 +571,6 @@ class RefundController extends Curd
                     $prepayid = $order->join_order_member_id . '-VIP';
                     $this->refundToVIP($order->join_order_member_id, $amount);
                     $response = ['order_id' => $order->order_id, 'member_id' => $order->join_order_member_id];
-                } elseif (isset($payWay['1']) && $payWay[1] == 'CARD') {
-                    $prepayid = $order->join_order_member_id . '-CARD';
-                    $this->refundToCard($order->join_order_member_id, $amount);
-                    $response = ['order_id' => $order->order_id, 'member_id' => $order->join_order_member_id];
                 } elseif ($payWay[0] == 'OFFLINE') {
                     $prepayid = 'OFFLINE';
                     $response = [];
@@ -584,6 +580,10 @@ class RefundController extends Curd
                 } elseif ($payWay[0] == 'OFFLINE_WXPAY') {
                     $prepayid = 'OFFLINE_WXPAY';
                     $response = [];
+                } elseif (!empty($payDetail0['pay_prepayid'])) {
+                    $prepayid = $payDetail0['pay_prepayid'];
+                    $this->refundToCard($payDetail0['pay_prepayid'], $amount);
+                    $response = ['order_id' => $order->order_id, 'member_id' => $order->join_order_member_id];
                 }
             }
             // payDetail 表记录

+ 2 - 1
app/event/statistics/InOutEvent.php

@@ -230,7 +230,8 @@ class InOutEvent
             $payJson = [
                 'trade' => '',
                 'if_union' => 'N',
-                'union_order_id' => ''
+                'union_order_id' => '',
+                'return' => 'Y'
             ];
             if (in_array($payDetail['pay_prepayid'], ['WXPAY', 'ALIPAY', 'OFFLINE_WXPAY', 'OFFLINE_ALIPAY', 'MONEY'])) {
                 $data['inout_attr'] = 'MONEY';