同步组合支付

app/admin/controller/order/RefundController.php

@@ -241,12 +241,14 @@ class RefundController extends Curd
             if (!OrderReturn::where('join_return_order_id', $orderId)->exists()) {
                 $returnId = $this->createReturnRecord($order, $amount, $remark);
             }else{
+                //['amount' => $amount, 'user_id' => JwtToken::getCurrentId(), 'datetime' => date('Y-m-d H:i:s'), 'remark' => $remark ?? '']
                 OrderReturn::where('join_return_order_id', $orderId)->update([
                     'order_return_status' => 'DONE',
                     'order_return_refund_json'=>json_encode([
                         'amount' => $amount,
                         'user_id' => JwtToken::getCurrentId(),
-                        'datetime' => date('Y-m-d H:i:s')
+                        'datetime' => date('Y-m-d H:i:s'),
+                        'remark' => $remark ?? ''
                     ])
                 ]);
             }
@@ -266,6 +268,9 @@ class RefundController extends Curd
                 } elseif ($payWay[0] == 'ALIPAY') {
                     $prepayid = 'WXPAY';
                     $response = $this->refundToAlipay($payDetail0, $amount);
+                } elseif ($payWay[0] == 'MONEY') {
+                    $prepayid = 'MONEY';
+                    $response = $this->refundToCash($payDetail0, $amount);
                 } elseif (isset($payWay[1]) && $payWay[1] == 'CASH') {
                     $prepayid = $order->join_order_member_id . '-CASH';
                     $this->refundToCash($order->join_order_member_id, $amount);