From 287ff561b40cb1ddad2f6474edd53687eaf6a865 Mon Sep 17 00:00:00 2001
From: lccsw <805383944@qq.com>
Date: Thu, 5 May 2022 14:06:14 +0800
Subject: [PATCH] edit-plan-settle

---
 api/controllers/plan/Biz.php  | 6 +++---
 api/controllers/plan/Plan.php | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/api/controllers/plan/Biz.php b/api/controllers/plan/Biz.php
index 4f11052d..7bb75aad 100644
--- a/api/controllers/plan/Biz.php
+++ b/api/controllers/plan/Biz.php
@@ -91,9 +91,9 @@ class Biz extends HD_Controller
     }
     
     //统计前一个月利润
-    public function merage(){
+    public function merge(){
 		$size = $this->input->get('size');
-        !$page && $page = 1;
+        $page = 1;
 		!$size && $size = 5;
 
         $where = [
@@ -154,7 +154,7 @@ class Biz extends HD_Controller
                         'manager_wage' => $biz_info['manager_wage'],
                         'commission' => $biz_info['commission']*$car_total,
                     ];
-                    $employee_wage = $biz_info['num'] ? ceil($car_total/$biz['num']) : 0;
+                    $employee_wage = $biz_info['num'] ? ceil($car_total/$biz_info['num']) : 0;
                     $data['employee_wage'] = $employee_wage;
                     $data['price_total'] = $val['price_all']+$data['profix_car_after'];
                     $price_need = $data['price_total'] - $data['rent'] - $data['wat_ele'] - $data['employee_wage'] - $data['manager_wage'] - $data['commission'] - $data['price_trucking'];
diff --git a/api/controllers/plan/Plan.php b/api/controllers/plan/Plan.php
index d23ccc2a..e6077cfe 100644
--- a/api/controllers/plan/Plan.php
+++ b/api/controllers/plan/Plan.php
@@ -38,6 +38,7 @@ class Plan extends CI_Controller
         $plan[] = array('url' => base_url(array('plan', 'licheb', 'users_log')), 'interval' => 2);//顾问日志
 
         $plan[] = array('url' => base_url(array('plan', 'biz', 'settle')), 'interval' => 1);
+        $plan[] = array('url' => base_url(array('plan', 'biz', 'merge')), 'interval' => 20); //合并结算
         $plan[] = array('url' => base_url(array('plan', 'order', 'up_old_status')), 'interval' => 30); //更新旧订单状态 
         $plan[] = array('url' => base_url(array('plan', 'order', 'out_time')), 'interval' => 10); //未支付订单过期
         $this->plan = $plan;