Merge branch 'master' into develop

README.md

@@ -7,6 +7,8 @@
 - 执行 `php artisan migrate`
 - 执行 `php artisan db:seed`
 - 执行 `php artisan passport:install`
+- 执行 `php artisan vendor:publish --tag=laravel-admin-grid-lightbox`
+- 执行 `php artisan vendor:publish --tag=laravel-admin-wang-editor2`
 - storage下所有目录 和 bootstrap/cache 目录应该是可写的
 - 键入 '域名/admin/auth/login'(后台登录)
 - 用户名：admin；密码：admin

app/Admin/Controllers/HomeController.php

@@ -14,35 +14,36 @@ class HomeController extends Controller
 {
     public function index(Content $content)
     {
-//        dd(\Admin::user()->isRole('financial_staff'));
         if (\Admin::user()->isRole('financial_staff')){
             return redirect('admin/refund_applications');
         }
+        $start_time = date('Y-m-d 00:00:00',time());
+        $end_time = date('Y-m-d 00:00:00',strtotime('+1 days',time()));
         return $content
             ->title('欢迎进入后台管理系统')
             ->description('后台数据中心')
             ->row('<h1 text-align="center">订单概况</h1>')
-            ->row(function (Row $row) {
+            ->row(function (Row $row) use ($end_time,$start_time){
                 // 产品类型(1.电话咨询 2.图文咨询 3.门诊预约 4.疫苗接种预约 5.儿保预约 6.服务包 7.充值)
-                $row->column(3, function (Column $column) {
-                    $column->append(infoBox('新增电话咨询订单', 'dropbox', '/admin/consulting_orders?product_type=1', 'green', Sta::getOrderCount(1)));
+                $row->column(3, function (Column $column) use ($end_time,$start_time){
+                    $column->append(infoBox('新增电话咨询订单', 'dropbox', '/admin/consulting_orders?product_type=1&created_at[start]='.$start_time.'&created_at[end]='.$end_time.'', 'green', Sta::getOrderCount(1)));
                 });
-                $row->column(3, function (Column $column) {
-                    $column->append(\App\Admin\Controllers\infoBox('新增图文咨询订单', 'dropbox', '/admin/consulting_orders?product_type=2', 'green', Sta::getOrderCount(2)));
+                $row->column(3, function (Column $column) use ($end_time,$start_time) {
+                    $column->append(\App\Admin\Controllers\infoBox('新增图文咨询订单', 'dropbox', '/admin/consulting_orders?product_type=2&created_at[start]='.$start_time.'&created_at[end]='.$end_time.'', 'green', Sta::getOrderCount(2)));
                 });
 
-                $row->column(3, function (Column $column) {
-                    $column->append(infoBox('新增门诊预约订单', 'user-plus', '/admin/booking_order?product_type=3', 'green',Sta::getOrderCount(3)));
+                $row->column(3, function (Column $column) use ($end_time,$start_time) {
+                    $column->append(infoBox('新增门诊预约订单', 'user-plus', '/admin/booking_order?product_type=3&created_at[start]='.$start_time.'&created_at[end]='.$end_time.'', 'green',Sta::getOrderCount(3)));
                 });
 
-                $row->column(3, function (Column $column) {
-                    $column->append(\App\Admin\Controllers\infoBox('新增计免预约订单', 'user-plus', '/admin/booking_order?product_type=4', 'green', Sta::getOrderCount(4)));
+                $row->column(3, function (Column $column) use ($end_time,$start_time) {
+                    $column->append(\App\Admin\Controllers\infoBox('新增计免预约订单', 'user-plus', '/admin/booking_order?product_type=4&created_at[start]='.$start_time.'&created_at[end]='.$end_time.'', 'green', Sta::getOrderCount(4)));
                 });
             })
-            ->row(function (Row $row) {
+            ->row(function (Row $row) use ($end_time,$start_time) {
                 //产品类型(1.电话咨询 2.图文咨询 3.门诊预约 4.疫苗接种预约 5.儿保预约 6.服务包 7.充值)
-                $row->column(3, function (Column $column) {
-                    $column->append(\App\Admin\Controllers\infoBox('新增儿保订单', 'dropbox', '/admin/booking_order?product_type=5', 'green', Sta::getOrderCount(5)));
+                $row->column(3, function (Column $column) use ($end_time,$start_time) {
+                    $column->append(\App\Admin\Controllers\infoBox('新增儿保订单', 'dropbox', '/admin/booking_order?product_type=5&created_at[start]='.$start_time.'&created_at[end]='.$end_time.'', 'green', Sta::getOrderCount(5)));
                 });
                 $row->column(3, function (Column $column) {
                     $column->append(\App\Admin\Controllers\infoBox('历史总订单', 'dropbox', 'javascript:void(0)', 'green', Sta::getOrderCount(0)));

app/Admin/Controllers/OrdersManagement/BookingOrderController.php

@@ -82,6 +82,7 @@ class BookingOrderController extends AdminController
                 );
                 $filter->timestampBetween('payment_time', "支付时间")->datetime();
                 $filter->timestampBetween('end_time', "订单完成时间")->datetime();
+                $filter->between('created_at','创建时间')->datetime();
 
             });
         });
@@ -114,6 +115,7 @@ class BookingOrderController extends AdminController
     });
         $status_arr = Order::getStatus();
         $grid->model()->orderBy('id','desc');
+        $grid->column('created_at','创建时间')->hide();
         $grid->column('id', __('Id'))->sortable();
         $grid->column('user.nickname', __('用户姓名'));
         $grid->column('docter.name', __('医生姓名'));
@@ -155,7 +157,7 @@ class BookingOrderController extends AdminController
                 return '<span class="label label-default">'.$info.'</span>';
             }
         });;
-        $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款',5=>'待退款'])->label([1=>'warring',2=>'success',3=>'info',4=>'danger',5=>'default']);;
+        $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款',5=>'待退款'])->label([1=>'warning',2=>'success',3=>'info',4=>'danger',5=>'default']);;
         $grid->column('total_amount', __('订单总金额'))->display(function ($money){
             return $money/100;
         });

app/Admin/Controllers/OrdersManagement/ConsultingOrdersController.php

@@ -83,6 +83,8 @@ class ConsultingOrdersController extends AdminController
                 $filter->timestampBetween('payment_time', "支付时间")->datetime();
                 $filter->timestampBetween('receiving_time', "接单时间")->datetime();
                 $filter->timestampBetween('end_time', "订单完成时间")->datetime();
+                // 设置datetime类型
+                $filter->between('created_at','创建时间')->datetime();
             });
         });
         //操作
@@ -133,7 +135,7 @@ class ConsultingOrdersController extends AdminController
                 return '<span class="label label-default">'.$info.'</span>';
             }
         });
-        $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款',5=>'待退款'])->label([1=>'warring',2=>'success',3=>'info',4=>'danger',5=>'default']);
+        $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款',5=>'待退款'])->label([1=>'warning',2=>'success',3=>'info',4=>'danger',5=>'default']);
         $grid->column('total_amount', __('订单总金额'))->display(function ($money){
             return $money/100;
         });
@@ -194,7 +196,7 @@ class ConsultingOrdersController extends AdminController
                 return date('Y-m-d H:i:s',$time);
             }
         });
-
+        $grid->column('created_at','创建时间')->hide();
         return $grid;
     }
 

app/Admin/Controllers/OrdersManagement/RechargeOrderController.php

@@ -36,6 +36,7 @@ class RechargeOrderController extends AdminController
             $filter->disableIdFilter();
 
             $filter->like('user.nickname','用户姓名');
+            $filter->equal('user.phone','用户电话');
             $filter->equal('order_status','订单状态')->radio(
                 [
                     ''=>'不限',
@@ -79,7 +80,7 @@ class RechargeOrderController extends AdminController
                 return '<span class="label label-default">'.$info.'</span>';
             }
         });
-        $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款'])->label([1=>'warring',2=>'success',3=>'info',4=>'danger']);;
+        $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款'])->label([1=>'warning',2=>'success',3=>'info',4=>'danger']);;
         $grid->column('total_amount', __('订单总金额'))->display(function ($money){
             return $money/100;
         });

app/Admin/Controllers/OrdersManagement/ServicePackOrderController.php

@@ -2,6 +2,7 @@
 
 namespace App\Admin\Controllers\OrdersManagement;
 
+use App\Admin\Actions\backstage\Docters\Team;
 use App\Admin\Actions\backstage\Orders\Evaluate;
 use App\Admin\Actions\backstage\Orders\ServicePack;
 use App\Admin\Actions\backstage\Orders\ServicePackOrderList;
@@ -38,6 +39,8 @@ class ServicePackOrderController extends AdminController
             $filter->disableIdFilter();
 
                 $filter->like('user.nickname','用户姓名');
+                $filter->equal('user.phone','用户电话');
+                $filter->like('orderPack.pack_name','服务包名称');
                 $filter->like('patient.name','患者姓名');
                 $filter->equal('order_status','订单状态')->radio(
                     [
@@ -49,7 +52,12 @@ class ServicePackOrderController extends AdminController
                         5=>'已取消'
                     ]
                 );
-                $filter->timestampBetween('payment_time', "支付时间")->datetime();
+                $filter->where(function ($query){
+                   $query->whereHas('orderPack',function ($query){
+                       $query->where('team_id','like',"%{$this->input}%");
+                   });
+                },'医生团队')->select(\App\Models\Team::where('status',1)->pluck('name','id'));
+            $filter->timestampBetween('payment_time', "支付时间")->datetime();
 
             });
         //操作
@@ -78,6 +86,16 @@ class ServicePackOrderController extends AdminController
         $grid->column('orderPack.pack_price', __('服务包价格'))->display(function ($money){
             return $money/100;
         });
+        $grid->column('orderPack.team_id', __('医生团队'))->display(function ($team){
+            if (empty($team))
+            {
+                return '无';
+            }else
+            {
+                $res = \App\Models\Team::whereIn('id',$team)->pluck('name')->toArray();
+                return $res;
+            }
+        })->label('info');
         $grid->column('product_type', __('产品类型'))->using([6=>'服务包订单']);
         $grid->column('payment_type', __('支付方式'))->using([1=>'微信支付',2=>'余额支付']);
         $grid->column('order_status', __('订单状态'))->display(function ($w) use ($status_arr) {
@@ -94,7 +112,7 @@ class ServicePackOrderController extends AdminController
                 return '<span class="label label-default">'.$info.'</span>';
             }
         });
-        $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款'])->label([1=>'warring',2=>'success',3=>'info',4=>'danger']);;
+        $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款'])->label([1=>'warning',2=>'success',3=>'info',4=>'danger']);
         $grid->column('total_amount', __('订单总金额'))->display(function ($money){
             return $money/100;
         });

app/Admin/Controllers/ServiceManagement/ServiceController.php

@@ -25,7 +25,7 @@ class ServiceController extends AdminController
      *
      * @var string
      */
-    protected $title = '服务审核';
+    protected $title = '服务开通';
 
     /**
      * Make a grid builder.
@@ -38,31 +38,34 @@ class ServiceController extends AdminController
 
 //        $status = request('status',2);
 
-        $grid->tools(function ($tools) {
-            $tools->batch(function ($batch) {
-                $batch->disableDelete();
-            });
-        });
+//        $grid->tools(function ($tools) {
+//            $tools->batch(function ($batch) {
+//                $batch->disableDelete();
+//            });
+//        });
+        $grid->disableBatchActions();
         $grid->model()->where('status','!=',3)->orderBy('id','desc');
         $grid->column('id', __('Id'));
-        $grid->column('ondocter.avatar', __('头像'))->lightbox(['width' =>'', 'height' => 30]);
+//        $grid->column('ondocter.avatar', __('头像'))->lightbox(['width' =>'', 'height' => 30]);
         $grid->column('ondocter.id', __('医生ID'));
         $grid->column('ondocter.name','医生名称');
-        $grid->column('service_type','服务类别')->using([1=>'图文咨询',2=>'电话咨询',3=>'门诊预约'])->label('default');
+        $grid->column('ondocter.phone','医生电话');
         $grid->column('ondocter.sex','性别')->using([1=>'男',2=>'女']);
+
+        $grid->column('service_type','服务类别')->using([1=>'图文咨询',2=>'电话咨询',3=>'门诊预约'])->label('default');
         $grid->column('docterorganization', __('所属机构'))->where('state',1)->pluck('organization_id')->display(function ($organization){
             $value = Organization::whereIn('id',$organization->toArray())->pluck('intro')->toArray();
             return $value;
         })->label('info')->width(300);
-        $grid->column('ondocter.label', __('标签'))->display(function ($label){
-            if($label==null || $label == '无')
-            {
-                return '无';
-            }else{
-                $label_value = DocterLabel::whereIn('id',$label)->pluck('label_name')->toArray();
-                return $label_value;
-            }
-        })->label(['info']);
+//        $grid->column('ondocter.label', __('标签'))->display(function ($label){
+//            if($label==null || $label == '无')
+//            {
+//                return '无';
+//            }else{
+//                $label_value = DocterLabel::whereIn('id',$label)->pluck('label_name')->toArray();
+//                return $label_value;
+//            }
+//        })->label(['info']);
 
 
         $grid->column('status', __('状态'))->using([1=>'待审核',2=>'已开通',3=>'未开通'])->label([
@@ -78,6 +81,8 @@ class ServiceController extends AdminController
             $filter->equal('service_type','服务类别')->select([1 => '图文咨询', 2 => '电话咨询', 3 => '门诊预约']);
             $filter->equal('status','状态')->select([1=>'待审核',2 =>'已开通 ']);
             $filter->equal('docterorganization.organization_id','所属机构')->select(Organization::pluck('intro','id'));
+            $filter->like('ondocter.name','医生名称');
+            $filter->equal('ondocter.phone','医生电话');
         });
         $grid->actions(function ($actions) {
             $actions->disableEdit();

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

@@ -54,7 +54,7 @@ class UserListController extends AdminController
         $grid->filter(function ($filter){
             $filter->column(1/2, function ($filter) {
                 $filter->disableIdFilter();
-                $filter->equal('phone','手机号码')->mobile()->placeholder("请输入手机");
+                $filter->equal('phone','手机号码');
                 $filter->like('nickname','用户名');
                 $filter->equal('status','用户状态')->radio([
                     ''   => '不限',
@@ -84,13 +84,13 @@ class UserListController extends AdminController
                     return $time;
                 }
             });
-            $grid->column('last_login_time', __('最后登录时间'))->display(function ($time){
-                if ($time == 0 ){
-                    return '';
-                }else{
-                    return date('Y-m-d H:i:s',$time);
-                }
-            });
+//            $grid->column('last_login_time', __('最后登录时间'))->display(function ($time){
+//                if ($time == 0 ){
+//                    return '';
+//                }else{
+//                    return date('Y-m-d H:i:s',$time);
+//                }
+//            });
         return $grid;
     }
 

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

@@ -5,6 +5,7 @@ namespace App\Admin\Controllers\UserManagement\BmUser;
 use App\Admin\Actions\backstage\Orders\OrderOpinion;
 use App\Admin\Actions\backstage\Orders\ServicePack;
 use App\Models\Order;
+use App\Models\OrderPack;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Form;
 use Encore\Admin\Grid;
@@ -30,7 +31,8 @@ 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');
+            $filter->like('orderPatient.name','患者姓名');
         });
         $grid->actions(function ($actions){
             $actions->disableView();
@@ -75,8 +77,9 @@ class UserOrdersController extends AdminController
                 return '余额支付';
             }
             if ($payment_type == 3){
-                $name = ServicePack::where('id',$this->pay_order_pack_id)->pluck('name');
-                return '服务包支付('.$name[0].')';
+                $order_pack_id = OrderPack::where('id',$this->pay_order_pack_id)->value('service_pack_id');
+                $name = \App\Models\ServicePack::where('id',$order_pack_id)->value('name');
+                return '服务包支付('.$name.')';
             }
             return '';
         });

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

@@ -52,7 +52,8 @@ class UserServiceController extends AdminController
         });
         $grid->column('orderPack.team_id', __('医生团队'))->display(function ($team)
         {
-            $team = json_decode($team);
+//            $team = json_encode($team);
+//            $team = json_decode($team);
             if (empty($team))
             {
                 return '无';

app/Admin/Controllers/UserManagement/DocterManagement/DoctorManagementController.php

@@ -55,6 +55,7 @@ class DoctorManagementController extends AdminController
                 1    => '已认证',
             ]);
         });
+        $grid->disableBatchActions();
         $grid->actions(function ($actions) {
             // 去掉编辑
             $actions->disableEdit();

app/Community/Controllers/ApiController.php

@@ -5,6 +5,7 @@ namespace App\Community\Controllers;
 
 
 use App\Http\Controllers\Controller;
+use App\Imports\Docter\DocterOrganizationInfo;
 use App\Models\Area;
 use App\Models\Docter;
 use App\Models\DocterOrganization;
@@ -47,11 +48,19 @@ class ApiController extends Controller
     public function getDocter()
     {
         $user = Admin::user();
+        $org_id = $user->org_id;
         $where = [];
         if ($user->docter_id) {
             $where ['id'] = $user->docter_id;
+            return Docter::where($where)->get(['name as text', 'id'])->toArray();
+        }
+        if ($org_id)
+        {
+            $docter_arr =  DocterOrganization::where('organization_id',$org_id)->where('state',1)->pluck('docter_id')->toArray();
+            return Docter::whereIn('id',$docter_arr)->get(['name as text', 'id'])->toArray();
+        }else{
+            return Docter::where($where)->get(['name as text', 'id'])->toArray();
         }
-        return Docter::where($where)->get(['name as text', 'id'])->toArray();
     }
 
     /**

app/Community/Controllers/OrderController.php

@@ -6,6 +6,7 @@ use App\Community\Actions\Clinc\Finished;
 use App\Community\Actions\Clinc\OrderCancel;
 use App\Community\Actions\Clinc\Reserved;
 use App\Models\Docter;
+use App\Models\DocterOrganization;
 use App\Models\Order;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Facades\Admin;
@@ -41,7 +42,6 @@ class OrderController extends AdminController
             } );
         });
         $is_admin = Admin::user()->inRoles(['administrator','devloper']);
-
         //检查是否是门诊医生
         $is_docter = $user->isRole('opc');
         $org_id = $user->org_id;
@@ -53,7 +53,7 @@ class OrderController extends AdminController
             $where ['organization_id']=$org_id;
         }
         $res = request()->all();
-        $grid->model()->where($where);
+        $grid->model()->where($where)->where('payment_status','!=',1);
         if(!empty($res['orderPatient']['appoint_start_time']['start']) || !empty($res['orderPatient']['appoint_start_time']['start']) ){
             $grid->model()->orderBy('appoint_start_time','desc');
         } else {

app/Community/Controllers/OrderNurseController.php

@@ -96,7 +96,7 @@ class OrderNurseController extends AdminController
                 return '<span class="label label-default">'.$info.'</span>';
             }
         });
-        $grid->column('payment_status', __('支付状态'))->using(Order::getPayStatus())->label([1=>'warring',2=>'success',3=>'info',4=>'danger',5=>'default']);
+        $grid->column('payment_status', __('支付状态'))->using(Order::getPayStatus())->label([1=>'warning',2=>'success',3=>'info',4=>'danger',5=>'default']);
         //查询
 //        $grid->quickSearch(function ($model, $query) {
 //            $model->whereHas('patient',function ($model) use ($query) {

app/Http/Controllers/Api/V1/CouponController.php

@@ -15,7 +15,7 @@ class CouponController extends AuthController
 {
     public function couponList()
     {
-        $data = Coupon::orderBy('id', 'desc')->paginate();
+        $data = Coupon::where('position_type', 1)->where('num', '>', 0)->orderBy('id', 'desc')->paginate();
 
         return out($data);
     }
@@ -28,8 +28,16 @@ class CouponController extends AuthController
         ]);
         $user = $this->user;
 
+        $coupon = Coupon::select(['num', 'position_type'])->where('id', $req['coupon_id'])->first();
+        if ($coupon['num'] <= 0) {
+            return out(null, 10001, '该优惠券数量不足');
+        }
+        if ($coupon['position_type'] == 2) {
+            return out(null, 10002, '该优惠券不能领取');
+        }
+
         if (UserCoupon::where('user_id', $user['id'])->where('coupon_id', $req['coupon_id'])->exists()) {
-            return out(null, 10001, '您已经领取过该优惠券了');
+            return out(null, 10003, '您已经领取过该优惠券了');
         }
 
         $add = Coupon::select(['id as coupon_id', 'name', 'title', 'desc', 'rules', 'icon', 'type', 'usable_type', 'money', 'discount', 'min_consume_amount', 'max_reduce_amount', 'expire_type', 'effective_days', 'start_time', 'end_time'])->where('id', $req['coupon_id'])->first()->getOriginal();
@@ -41,6 +49,8 @@ class CouponController extends AuthController
         $add['expire_time'] = $expire_time;
         UserCoupon::create($add);
 
+        Coupon::where('id', $req['coupon_id'])->decrement('num');
+
         return out();
     }
 

app/Models/OrderPack.php

@@ -20,6 +20,9 @@ class OrderPack extends BaseModel
     {
         return $this->belongsTo(Order::class);
     }
+    public function teams(){
+        return $this->hasOne(Team::class,'id','team_id');
+    }
 
     public function user()
     {