Home Explore Help
Register Sign In
swdz-WangHaijun
/
BaoMa
2
1
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

更新

ChenWuJie 4 years ago
parent
b7ce7f1c18
commit
166997e62d
8 changed files with 50 additions and 28 deletions
Unified View Show Diff Stats
  1. 4 4
      app/Admin/Actions/backstage/Coupon/CouponBatchGrant.php
  2. 23 0
      app/Admin/Actions/backstage/Coupon/CouponDistributions.php
  3. 2 11
      app/Admin/Controllers/CouponManagement/CouponDistributionUserList.php
  4. 11 9
      app/Admin/Controllers/CouponManagement/CouponManagementController.php
  5. 0 2
      app/Admin/Controllers/ServicePackOrderController.php
  6. 8 0
      app/Models/DocterOrganization.php
  7. 1 1
      app/Models/Organization.php
  8. 1 1
      app/Models/User.php

+ 4 - 4
app/Admin/Actions/backstage/Coupon/CouponBatchGrant.php
View File 

@@ -25,8 +25,8 @@ class CouponBatchGrant extends BatchAction
 
         //获取过期类型是指定几天过期
 
         //获取过期类型是指定几天过期
 
         if ($coupon->expire_type == 1){
 
         if ($coupon->expire_type == 1){
 
             $effective_days = $coupon->effective_days;
 
             $effective_days = $coupon->effective_days;
 
-            $expire_time = date("Y-m-d H:i:s",  ('+'.$effective_days.'day'));
 
-            $expire_time_num = strtotime($expire_time);
 
+            $str_time = '+'.$effective_days.'day';
 
+            $expire_time_num = strtotime($str_time);
 
             $arr = [
 
             $arr = [
 
                 'user_id' => 0,
 
                 'user_id' => 0,
 
                 'coupon_id'=>$coupon_id,
 
                 'coupon_id'=>$coupon_id,
 
@@ -46,7 +46,7 @@ class CouponBatchGrant extends BatchAction
 
                 'expire_time' => $expire_time_num,
 
                 'expire_time' => $expire_time_num,
 
                 'coupons_num'=>0
 
                 'coupons_num'=>0
 
             ];
 
             ];
 
-        }else{
 
+        }else if ($coupon->expire_type == 2){
 
             $arr = [
 
             $arr = [
 
                 'user_id' => 0,
 
                 'user_id' => 0,
 
                 'coupon_id'=>$coupon_id,
 
                 'coupon_id'=>$coupon_id,
 
@@ -77,7 +77,7 @@ class CouponBatchGrant extends BatchAction
 
     }
 
     }
 
     public function form()
 
     public function form()
 
     {
 
     {
 
-        $name = Coupon::pluck('name','id');
 
+        $name = Coupon::where('position_type',2)->pluck('name','id');
 
         $this->select('id', '优惠券名称')->options($name);
 
         $this->select('id', '优惠券名称')->options($name);
 
     }
 
     }
 
 }
 
 }

+ 23 - 0
app/Admin/Actions/backstage/Coupon/CouponDistributions.php
View File 

@@ -0,0 +1,23 @@
 
+<?php
 
+
 
+namespace App\Admin\Actions\backstage\Coupon;
 
+
 
+use Encore\Admin\Actions\Action;
 
+use Illuminate\Http\Request;
 
+
 
+class CouponDistributions extends Action
 
+{
 
+    protected $selector = '.coupon-distributions';
 
+    public function handle(Request $request)
 
+    {
 
+        // $request ...
 
+
 
+        return $this->response()->success('跳转优惠券发放列表成功')->redirect('/admin/coupon_distribution_user_list');
 
+    }
 
+    public function html()
 
+    {
 
+        return <<<HTML
 
+        <a class="btn btn-sm btn-default coupon-distributions">优惠券发放</a>
 
+HTML;
 
+    }
 
+}

+ 2 - 11
app/Admin/Controllers/CouponManagement/CouponDistributionUserList.php
View File 

@@ -26,9 +26,7 @@ class CouponDistributionUserList extends AdminController
 
     protected function grid()
 
     protected function grid()
 
     {
 
     {
 
         $grid = new Grid(new User());
 
         $grid = new Grid(new User());
 
-        $coupon_id = request('coupon_id');
 
         $grid->filter(function($filter){
 
         $grid->filter(function($filter){
 
-            // 去掉默认的id过滤器
 
             $filter->disableIdFilter();
 
             $filter->disableIdFilter();
 
             $filter->equal('phone','手机')->mobile()->placeholder("请输入手机");
 
             $filter->equal('phone','手机')->mobile()->placeholder("请输入手机");
 
             $filter->like('patient.name','患者姓名')->placeholder("请输入患者姓名");
 
             $filter->like('patient.name','患者姓名')->placeholder("请输入患者姓名");
 
@@ -45,16 +43,9 @@ class CouponDistributionUserList extends AdminController
 
             ]);
 
             ]);
 
         });
 
         });
 
         $grid->batchActions(function ($batch) {
 
         $grid->batchActions(function ($batch) {
 
-            $batch->add(new CouponBatchGrant($_GET['coupon_id']));
 
-        });
 
-        $grid->actions(function ($actions) {
 
-            // 去掉删除
 
-            $actions->disableDelete();
 
-            // 去掉编辑
 
-            $actions->disableEdit();
 
-            // 去掉查看
 
-            $actions->disableView();
 
+            $batch->add(new CouponBatchGrant());
 
         });
 
         });
 
+        $grid->disableActions();
 
         $grid ->model()->where('status','>=','0');
 
         $grid ->model()->where('status','>=','0');
 
         $grid->column('id', __('用户id'))->sortable();
 
         $grid->column('id', __('用户id'))->sortable();
 
         $grid->column('nickname', __('用户名'));
 
         $grid->column('nickname', __('用户名'));

+ 11 - 9
app/Admin/Controllers/CouponManagement/CouponManagementController.php
View File 

@@ -4,6 +4,7 @@ namespace App\Admin\Controllers\CouponManagement;
 
 
 
 use App\Admin\Actions\backstage\Coupon\CouponDetails;
 
 use App\Admin\Actions\backstage\Coupon\CouponDetails;
 
 use App\Admin\Actions\backstage\Coupon\CouponDistribution;
 
 use App\Admin\Actions\backstage\Coupon\CouponDistribution;
 
+use App\Admin\Actions\backstage\Coupon\CouponDistributions;
 
 use App\Models\Coupon;
 
 use App\Models\Coupon;
 
 use Encore\Admin\Controllers\AdminController;
 
 use Encore\Admin\Controllers\AdminController;
 
 use Encore\Admin\Form;
 
 use Encore\Admin\Form;
 
@@ -28,13 +29,12 @@ class CouponManagementController extends AdminController
 
     {
 
     {
 
         $grid = new Grid(new Coupon());
 
         $grid = new Grid(new Coupon());
 
 
 
+        $grid->tools(function (Grid\Tools $tools) {
 
+            $tools->append(new CouponDistributions());
 
+        });
 
         $grid->actions(function ($actions) {
 
         $grid->actions(function ($actions) {
 
             $actions->disableView();
 
             $actions->disableView();
 
             $actions->add(new CouponDetails());
 
             $actions->add(new CouponDetails());
 
-            if($actions->row->position_type == 2 )
 
-            {
 
-                $actions->add(new CouponDistribution());
 
-            }
 
         });
 
         });
 
 
 
         $grid->column('id', __('Id'));
 
         $grid->column('id', __('Id'));
 
@@ -51,9 +51,13 @@ class CouponManagementController extends AdminController
 
         $grid->column('num', __('数量'));
 
         $grid->column('num', __('数量'));
 
         $grid->column('effective_days', __('有效天数'));
 
         $grid->column('effective_days', __('有效天数'));
 
         $grid->column('start_time', __('有效期开始时间'))->display(function ($time){
 
         $grid->column('start_time', __('有效期开始时间'))->display(function ($time){
 
+            if ($time ==0)
 
+                return '';
 
             return date('Y-m-d H:i:s',$time);
 
             return date('Y-m-d H:i:s',$time);
 
         });
 
         });
 
         $grid->column('end_time', __('有效期结束时间'))->display(function ($time){
 
         $grid->column('end_time', __('有效期结束时间'))->display(function ($time){
 
+            if ($time ==0)
 
+                return '';
 
             return date('Y-m-d H:i:s',$time);
 
             return date('Y-m-d H:i:s',$time);
 
         });
 
         });
 
         return $grid;
 
         return $grid;
 
@@ -104,7 +108,7 @@ class CouponManagementController extends AdminController
 
         $form->text('title', __('券标题'));
 
         $form->text('title', __('券标题'));
 
         $form->text('desc', __('使用说明'));
 
         $form->text('desc', __('使用说明'));
 
         $form->text('rules', __('使用规则'));
 
         $form->text('rules', __('使用规则'));
 
-        $form->image('icon', __('券图标'));
 
+        $form->image('icon', __('券图标'))->help('图标大小48px * 48px');
 
         $form->select('type', '类型')
 
         $form->select('type', '类型')
 
             ->options([
 
             ->options([
 
                 1 => '满减券',
 
                 1 => '满减券',
 
@@ -126,10 +130,8 @@ class CouponManagementController extends AdminController
 
             ])->when(1, function (Form $form) {
 
             ])->when(1, function (Form $form) {
 
                 $form->text('effective_days', __('有效天数'));
 
                 $form->text('effective_days', __('有效天数'));
 
             })->when(2, function (Form $form) {
 
             })->when(2, function (Form $form) {
 
-                $form->date('start_time', __('有效期开始时间'))->required();
 
-                $form->date('end_time', __('有效期结束时间'))->required()->rules(
 
-                    'date|after:start_time',['after' => '结束时间小于开始时间']
 
-                );
 
+                $form->date('start_time', __('有效期开始时间'));
 
+                $form->date('end_time', __('有效期结束时间'));
 
                 $form->saving(function ($form){
 
                 $form->saving(function ($form){
 
                     $form->start_time = strtotime($form->start_time);
 
                     $form->start_time = strtotime($form->start_time);
 
                     $form->end_time = strtotime($form->end_time);
 
                     $form->end_time = strtotime($form->end_time);

+ 0 - 2
app/Admin/Controllers/ServicePackOrderController.php
View File 

@@ -67,8 +67,6 @@ class ServicePackOrderController extends AdminController
 
         $grid->column('id', __('Id'))->sortable();
 
         $grid->column('id', __('Id'))->sortable();
 
         $grid->column('user_id', __('用户id'));
 
         $grid->column('user_id', __('用户id'));
 
         $grid->column('user.nickname', __('用户姓名'));
 
         $grid->column('user.nickname', __('用户姓名'));
 
-        $grid->column('docter_id', __('医生id'));
 
-        $grid->column('docter.name', __('医生姓名'));
 
         $grid->column('patient_id', __('患者id'));
 
         $grid->column('patient_id', __('患者id'));
 
         $grid->column('orderPatient.name', __('患者姓名'));
 
         $grid->column('orderPatient.name', __('患者姓名'));
 
         $grid->column('orderPack.service_pack_id', __('服务包id'));
 
         $grid->column('orderPack.service_pack_id', __('服务包id'));

+ 8 - 0
app/Models/DocterOrganization.php
View File 

@@ -7,6 +7,9 @@ use Illuminate\Database\Eloquent\Model;
 
 class DocterOrganization extends Model
 
 class DocterOrganization extends Model
 
 {
 
 {
 
     protected $table = 'docter_organization';
 
     protected $table = 'docter_organization';
 
+    protected $casts = [
 
+        'card_photo' => 'json',
 
+    ];
 
 
 
     //医生类型(1.问诊医生 2.疫苗医生 3.儿保医生)
 
     //医生类型(1.问诊医生 2.疫苗医生 3.儿保医生)
 
     public  static $_doct_type = [1=>'门诊医生',2=>'疫苗医生',3=>'儿保医生'];
 
     public  static $_doct_type = [1=>'门诊医生',2=>'疫苗医生',3=>'儿保医生'];
 
@@ -31,4 +34,9 @@ class DocterOrganization extends Model
 
         return $this->hasOne(Organization::class,'id','organization_id');
 
         return $this->hasOne(Organization::class,'id','organization_id');
 
     }
 
     }
 
 
 
+    public  function teamdocter()
 
+    {
 
+        return $this->hasOne(TeamDocter::class,'docter_id','docter_id');
 
+    }
 
+
 
 }
 
 }

+ 1 - 1
app/Models/Organization.php
View File 

@@ -24,7 +24,7 @@ class Organization extends BaseModel
 
     }
 
     }
 
     public function docter()
 
     public function docter()
 
     {
 
     {
 
-        return $this->belongsToMany(Docter::class);
 
+        return $this->belongsTo(Docter::class);
 
     }
 
     }
 
 
 
     public function user()
 
     public function user()

+ 1 - 1
app/Models/User.php
View File 

@@ -94,6 +94,6 @@ class User extends BaseModel
 
         return $this->hasMany(UserBalanceLog::class);
 
         return $this->hasMany(UserBalanceLog::class);
 
     }
 
     }
 
     public function patient(){
 
     public function patient(){
 
-        return $this->hasMany(Patient::class);
 
+        return $this->hasMany(Patient::class,'user_id','id');
 
     }
 
     }
 
 }
 
 }