Merge branch 'master' of http://git.9026.com/swdz-WangHaijun/BaoMa

app/Admin/Controllers/OrdersManagement/BookingOrderController.php

@@ -103,7 +103,8 @@ class BookingOrderController extends AdminController
                 return '余额支付';
             }
             if ($payment_type == 3){
-                $name = ServicePack::where('id',$this->pay_order_pack_id)->pluck('name');
+                $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].')';
             }
         });

app/Admin/Controllers/OrdersManagement/ConsultingOrdersController.php

@@ -7,6 +7,7 @@ use App\Admin\Actions\backstage\Orders\OrderDetails;
 use App\Admin\Actions\backstage\User\MapDepot;
 use App\Admin\Actions\backstage\User\Suggests;
 use App\Models\Order;
+use App\Models\OrderPack;
 use App\Models\ServicePack;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Form;
@@ -103,7 +104,8 @@ class ConsultingOrdersController extends AdminController
                 return '余额支付';
             }
             if ($payment_type == 3){
-                $name = ServicePack::where('id',$this->pay_order_pack_id)->pluck('name');
+                $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].')';
             }
         });