优化用户管理模块

app/Admin/Controllers/UserManagement/BmUser/UserBalanceLogController.php

@@ -30,11 +30,12 @@ class UserBalanceLogController extends AdminController
         $uesr_id = \request('user_id');
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
-            $filter->equal('user_id','用户id');
+//            $filter->equal('user_id','用户id');
         });
         //关闭全部的操作
         $grid->disableActions();
-        $grid->model()->orderBy('id','desc');
+        $grid->disableBatchActions();
+        $grid->model()->where('user_id',$uesr_id)->orderBy('id','desc');
         $grid->column('id', __('Id'));
         $grid->column('user_id', __('用户ID'));
         $grid->column('user.nickname', __('用户名称'));

app/Admin/Controllers/UserManagement/BmUser/UserCouponsController.php

@@ -2,11 +2,13 @@
 
 namespace App\Admin\Controllers\UserManagement\BmUser;
 
+use App\Models\CouponType;
 use App\Models\UserCoupon;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Form;
 use Encore\Admin\Grid;
 use Encore\Admin\Show;
+use SebastianBergmann\CodeCoverage\TestFixture\C;
 
 class UserCouponsController extends AdminController
 {
@@ -29,10 +31,11 @@ class UserCouponsController extends AdminController
         $uesr_id = \request('user_id');
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
-            $filter->equal('user_id','用户id');
+//            $filter->equal('user_id','用户id');
         });
         $grid->disableActions();
-        $grid->model()->orderBy('id','desc');
+        $grid->disableBatchActions();
+        $grid->model()->where('user_id',$uesr_id)->orderBy('id','desc');
         $grid->column('id', __('Id'));
         $grid->column('coupon_id', __('优惠券ID'));
         $grid->column('name', __('券名称'));
@@ -40,35 +43,43 @@ class UserCouponsController extends AdminController
         $grid->column('title', __('券标题'));
         $grid->column('type', __('类型'))->using([1=>'满减券',2=>'折扣券']);
         $grid->column('usable_type', __('可用类型'))->using([1=>'全部产品通用',2=>'部分产品可用']);
-        $grid->column('CouponType', __('可用产品'))->pluck('product_type','id')->display(function ($i){
+        $grid->column('CouponType', __('可用产品'))->pluck('product_type','id')->display(function (){
             $name = [];
-            foreach ($i as $value)
+            if ($this->usable_type != 1)
             {
-                switch ($value){
-                    case 1:
-                        array_push($name,'电话咨询');
-                        break;
-                    case 2:
-                        array_push($name,'图文咨询');
-                        break;
-                    case 3:
-                        array_push($name,'门诊咨询');
-                        break;
-                    case 4:
-                        array_push($name,'疫苗接种');
-                        break;
-                    case 5:
-                        array_push($name,'儿保预约');
-                        break;
-                    case 6:
-                        array_push($name,'服务包');
-                        break;
-                    case 7:
-                        array_push($name,'充值');
-                        break;
+                $coupon = CouponType::where('coupon_id',$this->coupon_id)->where('user_coupon_id',0)->pluck('product_type')->toArray();
+                $name = [];
+                foreach ($coupon as $value)
+                {
+                    switch ($value){
+                        case 1:
+                            array_push($name,'电话咨询');
+                            break;
+                        case 2:
+                            array_push($name,'图文咨询');
+                            break;
+                        case 3:
+                            array_push($name,'门诊咨询');
+                            break;
+                        case 4:
+                            array_push($name,'疫苗接种');
+                            break;
+                        case 5:
+                            array_push($name,'儿保预约');
+                            break;
+                        case 6:
+                            array_push($name,'服务包');
+                            break;
+                        case 7:
+                            array_push($name,'充值');
+                            break;
+                    }
                 }
+                return $name;
+            }else{
+                array_push($name,'全产品通用');
+                return $name;
             }
-            return $name;
         })->label('info');
         $grid->column('money', __('满减券的优惠钱数'))->display(function ($money){
             return $money/100;

app/Admin/Controllers/UserManagement/BmUser/UserListController.php

@@ -55,15 +55,15 @@ class UserListController extends AdminController
             $filter->column(1/2, function ($filter) {
                 $filter->disableIdFilter();
                 $filter->equal('phone','手机')->mobile()->placeholder("请输入手机");
-                $filter->like('patient.name','患者姓名')->placeholder("请输入患者姓名");
                 $filter->like('nickname','昵称');
-            });
-            $filter->column(1/2, function ($filter) {
                 $filter->equal('status','用户状态')->radio([
                     ''   => '不限',
                     0    => '黑名单',
                     1    => '正常',
                 ]);
+            });
+            $filter->column(1/2, function ($filter) {
+
                 $filter->between('created_at', '注册时间')->datetime();
                 $filter->timestampBetween('last_login_time', "最后登录时间")->datetime();
             });

app/Admin/Controllers/UserManagement/BmUser/UserOrdersController.php

@@ -29,20 +29,35 @@ class UserOrdersController extends AdminController
         $uesr_id = \request('user_id');
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
-            $filter->equal('user_id','用户id');
+//            $filter->equal('user_id','用户id');
         });
         $grid->disableActions();
-        $grid->model()->orderBy('id','desc');
+        $grid->model()->where('user_id',$uesr_id)->orderBy('id','desc');
         $grid->column('id', __('Id'))->sortable();
+        $grid->column('user_id', __('用户id'))->sortable()->hide();
         $grid->column('user.nickname', __('用户姓名'));
         $grid->column('docter.name', __('医生姓名'));
         $grid->column('orderPatient.name', __('患者姓名'));
         $grid->column('orderPatient.patient_phone', __('患者电话'));
         $grid->column('orderPatient.appoint_start_time', __('预约日期'))->display(function ($time){
-            return date('Y-m-d H:i:s',$time);
+            if ($time == 0)
+            {
+                return '';
+            }else
+            {
+                return date('Y-m-d H:i:s',$time);
+
+            }
         });
         $grid->column('orderPatient.appoint_end_time', __('就诊日期'))->display(function ($time){
-            return date('Y-m-d H:i:s',$time);
+            if ($time == 0)
+            {
+                return '';
+            }else
+            {
+                return date('Y-m-d H:i:s',$time);
+
+            }
         });
         $grid->column('product_type', __('产品类型'))->using([1=>'电话咨询',2=>'图文咨询',3=>'门诊预约',4=>'疫苗接种预约',5=>'儿保预约',6=>'服务包',7=>'充值']);
         $grid->column('payment_type', __('支付方式'))->display(function ($payment_type){

app/Admin/Controllers/UserManagement/BmUser/UserServiceController.php

@@ -33,18 +33,12 @@ class UserServiceController extends AdminController
         $uesr_id = \request('user_id');
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
-            $filter->equal('user_id','用户id');
-            $filter->equal('product_type','订单类型');
+//            $filter->equal('user_id','用户id');
+//            $filter->equal('product_type','订单类型');
         });
-        $grid->actions(function ($actions) {
-
-            // 去掉删除
-            $actions->disableDelete();
-
-            // 去掉编辑
-            $actions->disableEdit();
-        });
-        $grid->model()->orderBy('id','desc');
+        $grid->disableBatchActions();
+        $grid->disableActions();
+        $grid->model()->where('user_id',$uesr_id)->where('product_type',6)->orderBy('id','desc');
         $grid->column('orderPack.id', __('Id'));
         $grid->column('orderPack.order_id', __('订单id'));
         $grid->column('patient_id', __('患者姓名'))->display(function ($id){

app/Models/UserCoupon.php

@@ -50,6 +50,6 @@ class UserCoupon extends BaseModel
 
     public function couponType()
     {
-        return $this->hasMany(CouponType::class);
+        return $this->hasMany(CouponType::class,'coupon_id','coupon_id');
     }
 }