更新

app/Admin/Controllers/OrdersManagement/BookingOrderController.php

@@ -5,6 +5,7 @@ namespace App\Admin\Controllers\OrdersManagement;
 use App\Admin\Actions\backstage\Orders\Evaluate;
 use App\Admin\Actions\backstage\Orders\RefundApplicationAction;
 use App\Admin\Actions\backstage\Refund\RefundCompleteAction;
+use App\Admin\Actions\backstage\Refund\RefundServicePackAction;
 use App\Models\Order;
 use App\Admin\Actions\backstage\Orders\OrderDetails;
 use App\Models\OrderPack;
@@ -83,7 +84,14 @@ class BookingOrderController extends AdminController
                     ($actions->row->order_status == 5 && $actions->row->payment_status == 5)||
                     //已超时 已支付
                     ($actions->row->order_status == 6 && $actions->row->payment_status == 2)){
-                    $actions->add(new RefundApplicationAction());
+                        //判断是否是服务包支付 是的话走退次数的逻辑，不是的话走退余额的操作
+                        if ($actions->row->payment_type == 3)
+                        {
+                            $actions->add(new RefundServicePackAction());
+                        }else
+                        {
+                            $actions->add(new RefundApplicationAction());
+                        }
                 }
             }
             //有问题 未支付是订单状态，这里冲突了
@@ -136,9 +144,9 @@ class BookingOrderController extends AdminController
                 return '余额支付';
             }
             if ($payment_type == 3){
-                $order_pack_id = OrderPack::where('id',$this->pay_order_pack_id)->pluck('service_pack_id');
-                $name = ServicePack::where('id',$order_pack_id[0])->pluck('name');
-                return '服务包支付('.$name[0].')';
+                $order_pack_id = OrderPack::where('id',$this->pay_order_pack_id)->value('service_pack_id');
+                $name = ServicePack::where('id',$order_pack_id)->value('name');
+                return '服务包支付('.$name.')';
             }
         });
         $grid->column('order_status', __('订单状态'))->using([1=>'未支付',2=>'待接单',3=>'进行中',4=>'已完成',5=>'已取消',6=>'已超时',7=>'已预约']);