Browse Source

服务包支付的情况下,要显示服务包支付,并且是哪个服务包支付的

ChenWuJie 4 years ago
parent
commit
6cec24fa05

+ 14 - 16
app/Admin/Controllers/OrdersManagement/BookingOrderController.php

xqd xqd
@@ -6,6 +6,7 @@ use App\Admin\Actions\backstage\Orders\Evaluate;
 use App\Models\Order;
 use App\Admin\Actions\backstage\Orders\OrderDetails;
 use App\Models\OrderPack;
+use App\Models\ServicePack;
 use Encore\Admin\Controllers\AdminController;
 use App\Admin\Actions\backstage\User\MapDepot;
 use App\Admin\Actions\backstage\User\Suggests;
@@ -93,22 +94,19 @@ class BookingOrderController extends AdminController
             return date('Y-m-d H:i:s',$time);
         });
         $grid->column('product_type', __('产品类型'))->using([3=>'门诊预约',4=>'疫苗接种预约',5=>'儿保预约']);
-        $grid->column('payment_type', __('支付方式'))->using([1=>'微信支付',2=>'余额支付',3=>'服务包支付']);
-//        $grid->column('payment_type', __('支付方式'))->display(function ($payment_type){
-//            if ($payment_type == 1)
-//            {
-//                return '微信支付';
-//            }
-//            if ($payment_type == 2){
-//                return '余额支付';
-//            }
-//            if ($payment_type == 3){
-//////                dd($this);
-////                $patient_id = $this->patient_id;
-////                $orde_id = Order::where('patient_id',$patient_id)->where('product_type',6)->get('id');
-//                return '服务包支付';
-//            }
-//        });
+        $grid->column('payment_type', __('支付方式'))->display(function ($payment_type){
+            if ($payment_type == 1)
+            {
+                return '微信支付';
+            }
+            if ($payment_type == 2){
+                return '余额支付';
+            }
+            if ($payment_type == 3){
+                $name = ServicePack::where('id',$this->pay_order_pack_id)->pluck('name');
+                return '服务包支付('.$name[0].')';
+            }
+        });
         $grid->column('order_status', __('订单状态'))->using([1=>'未支付',2=>'待接单',3=>'进行中',4=>'已完成',5=>'已取消']);
         $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款']);
         $grid->column('total_amount', __('订单总金额'))->display(function ($money){

+ 14 - 1
app/Admin/Controllers/OrdersManagement/ConsultingOrdersController.php

xqd xqd
@@ -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\ServicePack;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Form;
 use Encore\Admin\Grid;
@@ -92,7 +93,19 @@ class ConsultingOrdersController extends AdminController
         $grid->column('orderPatient.patient_phone', __('患者电话'));
         $grid->column('orderPatient.symptoms', __('患者描述'));
         $grid->column('product_type', __('产品类型'))->using([1=>'电话咨询',2=>'图文咨询']);
-        $grid->column('payment_type', __('支付方式'))->using([1=>'微信支付',2=>'余额支付',3=>'服务包支付']);
+        $grid->column('payment_type', __('支付方式'))->display(function ($payment_type){
+            if ($payment_type == 1)
+            {
+                return '微信支付';
+            }
+            if ($payment_type == 2){
+                return '余额支付';
+            }
+            if ($payment_type == 3){
+                $name = ServicePack::where('id',$this->pay_order_pack_id)->pluck('name');
+                return '服务包支付('.$name[0].')';
+            }
+        });
         $grid->column('order_status', __('订单状态'))->using([1=>'未支付',2=>'待接单',3=>'进行中',4=>'已完成',5=>'已取消']);
         $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款']);
         $grid->column('total_amount', __('订单总金额'))->display(function ($money){