更新

app/Admin/Controllers/LawyerCostCollectController.php

@@ -19,14 +19,12 @@ class LawyerCostCollectController extends AdminController
      */
      */
     protected function grid()
     protected function grid()
     {
     {
-        $list = ModelLawyerCost::COSTiTEM;
-        return Grid::make(new LawyerCost(), function (Grid $grid) use ($list) {
+        return Grid::make(new LawyerCost(), function (Grid $grid) {
             $number = $grid->model()->filter()->input('no') ?? ''; //律师编号
             $number = $grid->model()->filter()->input('no') ?? ''; //律师编号
             $nowyear = date("Y");
             $nowyear = date("Y");
             $year = $grid->model()->filter()->input('year') ?? '';
             $year = $grid->model()->filter()->input('year') ?? '';
             $monthNum = ($year && $year < $nowyear)  ? 12 : date('m');
             $monthNum = ($year && $year < $nowyear)  ? 12 : date('m');
 
 
-
             $grid->column('title', '项目名称')->width('10%');
             $grid->column('title', '项目名称')->width('10%');
             for ($i = 1; $i <= $monthNum; $i++) {
             for ($i = 1; $i <= $monthNum; $i++) {
                 $grid->column($i, $i . '月');
                 $grid->column($i, $i . '月');

app/Admin/Controllers/LawyerCostController.php

@@ -47,7 +47,7 @@ protected function grid()
                 return self::getAnnuity($this->number, $year);
                 return self::getAnnuity($this->number, $year);
             });
             });
             $grid->column('posting_tickets_fee', '贴票成本')->display(function ($val) use ($year) {
             $grid->column('posting_tickets_fee', '贴票成本')->display(function ($val) use ($year) {
-                return self::getAssistantFee($this->number, $year);
+                return ModelLawyerCost::getPostingTicketsMoney($this->id, $year, $this->commission_rate, $this->ticket_ratio);
             });
             });
             $grid->column('assistant_fee', '助理律师成本')->display(function ($val) use ($year) {
             $grid->column('assistant_fee', '助理律师成本')->display(function ($val) use ($year) {
                 return self::getAssistantFee($this->number, $year);
                 return self::getAssistantFee($this->number, $year);

app/Admin/Repositories/LawyerCost.php

@@ -124,7 +124,7 @@ public function get(Grid\Model $model)
                 //贴票成本  
                 //贴票成本  
                 if ($val['field'] == 'posting_tickets_fee') {
                 if ($val['field'] == 'posting_tickets_fee') {
                     $lawyerObj = ModelLawyer::where('number', $lnum)->first();
                     $lawyerObj = ModelLawyer::where('number', $lnum)->first();
-                    $tickets_money = ModelLawyerCost::getPostingTicketsMoney($lawyerObj->lawyer_id, $year, $lawyerObj->commission_rate, $lawyerObj->ticket_ratio, $i);
+                    $tickets_money = ModelLawyerCost::getPostingTicketsMoney($lawyerObj->id, $year, $lawyerObj->commission_rate, $lawyerObj->ticket_ratio, $i);
 
 
                     $tmp[$i] = $tickets_money;
                     $tmp[$i] = $tickets_money;
                 }
                 }

app/Models/LawyerCost.php

@@ -201,17 +201,19 @@ public static function getPostingTicketsMoney($lawyer_id, $year, $commission_rat
         $commission = $received_money * ($commission_rate / 100); //提成
         $commission = $received_money * ($commission_rate / 100); //提成
         if ($commission_rate == 80) {
         if ($commission_rate == 80) {
             if ($commission > 300000) {
             if ($commission > 300000) {
-                $ticket = ($received_money - $paid_amount) * ($ticket_ratio / 100);
+                $ticket = ($commission - $paid_amount) * ($ticket_ratio / 100);
+                return $ticket;
             }
             }
         } elseif ($commission_rate == 85) {
         } elseif ($commission_rate == 85) {
             if ($commission > 200000) {
             if ($commission > 200000) {
-                $ticket = ($received_money - $paid_amount) * ($ticket_ratio / 100);
+                $ticket = ($commission - $paid_amount) * ($ticket_ratio / 100);
             }
             }
         } elseif ($commission_rate == 88 || $commission_rate == 90) {
         } elseif ($commission_rate == 88 || $commission_rate == 90) {
             if ($commission > 200000) {
             if ($commission > 200000) {
-                $ticket = ($received_money - $paid_amount) * ($ticket_ratio / 100);
+                $ticket = ($commission - $paid_amount) * ($ticket_ratio / 100);
             }
             }
         }
         }
+
         return $ticket;
         return $ticket;
     }
     }
 
 
@@ -240,15 +242,15 @@ public static function getAllPostingTicketsMoney($lawyer_id, $year)
                 $commission = $received_money * ($commission_rate / 100); //提成
                 $commission = $received_money * ($commission_rate / 100); //提成
                 if ($commission_rate == 80) {
                 if ($commission_rate == 80) {
                     if ($commission > 300000) {
                     if ($commission > 300000) {
-                        $ticket = ($received_money - $paid_amount) * ($ticket_ratio / 100);
+                        $ticket = ($commission - $paid_amount) * ($ticket_ratio / 100);
                     }
                     }
                 } elseif ($commission_rate == 85) {
                 } elseif ($commission_rate == 85) {
                     if ($commission > 200000) {
                     if ($commission > 200000) {
-                        $ticket = ($received_money - $paid_amount) * ($ticket_ratio / 100);
+                        $ticket = ($commission - $paid_amount) * ($ticket_ratio / 100);
                     }
                     }
                 } elseif ($commission_rate == 88 || $commission_rate == 90) {
                 } elseif ($commission_rate == 88 || $commission_rate == 90) {
                     if ($commission > 200000) {
                     if ($commission > 200000) {
-                        $ticket = ($received_money - $paid_amount) * ($ticket_ratio / 100);
+                        $ticket = ($commission - $paid_amount) * ($ticket_ratio / 100);
                     }
                     }
                 }
                 }
                 $total += $ticket;
                 $total += $ticket;