删除无用的注释和文件

app/Gdoo/CustomerCost/Controllers/AdjustController.php

@@ -84,7 +84,6 @@ class AdjustController extends AuditController
         ]);
     }
 
-    // 其他费用
     public function createAction($action = 'edit')
     {
         $id = (int)Request::get('id');
@@ -103,19 +102,16 @@ class AdjustController extends AuditController
         ], 'create');
     }
 
-    // 编辑促销
     public function editAction()
     {
         return $this->createAction();
     }
 
-    // 显示促销
     public function showAction()
     {
         return $this->createAction('show');
     }
 
-    // 删除促销
     public function deleteAction()
     {
         if (Request::method() == 'POST') {

app/Gdoo/CustomerCost/Controllers/CategoryController.php

@@ -67,7 +67,6 @@ class CategoryController extends DefaultController
         ]);
     }
 
-    // 新建客户联系人
     public function createAction()
     {
         $id = (int)Request::get('id');
@@ -77,27 +76,11 @@ class CategoryController extends DefaultController
         ], 'create');
     }
 
-    // 创建客户联系人
     public function editAction()
     {
         return $this->createAction();
     }
 
-    // 显示客户联系人
-    public function showAction()
-    {
-        $id = (int)Request::get('id');
-        $group = Category::find($id);
-        $options = [
-            'table' => 'customer_cost_category',
-            'row' => $group,
-        ];
-        $tpl = Form::show($options);
-        return $this->display([
-            'tpl' => $tpl,
-        ]);
-    }
-
    public function dialogAction()
     {
         $search = search_form([], [
@@ -106,7 +89,7 @@ class CategoryController extends DefaultController
         ]);
 
         if (Request::method() == 'POST') {
-            $model = Type::orderBy('sort', 'asc');
+            $model = Category::orderBy('sort', 'asc');
             foreach ($search['where'] as $where) {
                 if ($where['active']) {
                     $model->search($where);

app/Gdoo/CustomerCost/Controllers/CompenController.php

@@ -80,7 +80,6 @@ class CompenController extends AuditController
         ]);
     }
 
-    // 其他费用
     public function createAction($action = 'edit')
     {
         $id = (int)Request::get('id');
@@ -99,13 +98,11 @@ class CompenController extends AuditController
         ], 'create');
     }
 
-    // 编辑促销
     public function editAction()
     {
         return $this->createAction();
     }
 
-    // 显示促销
     public function showAction()
     {
         return $this->createAction('show');
@@ -155,7 +152,6 @@ class CompenController extends AuditController
         return view('importExcel');
     }
 
-    // 删除促销
     public function deleteAction()
     {
         if (Request::method() == 'POST') {

app/Gdoo/CustomerCost/Controllers/CostController.php

@@ -96,7 +96,6 @@ class CostController extends AuditController
         ]);
     }
 
-    // 其他费用
     public function createAction($action = 'edit')
     {
         $id = (int)Request::get('id');
@@ -115,13 +114,11 @@ class CostController extends AuditController
         ], 'create');
     }
 
-    // 编辑促销
     public function editAction()
     {
         return $this->createAction();
     }
 
-    // 显示促销
     public function showAction()
     {
         return $this->createAction('show');
@@ -245,7 +242,6 @@ class CostController extends AuditController
         ]);
     }
 
-    // 删除促销
     public function deleteAction()
     {
         if (Request::method() == 'POST') {

app/Gdoo/CustomerCost/Controllers/RebateController.php

@@ -80,7 +80,6 @@ class RebateController extends AuditController
         ]);
     }
 
-    // 其他费用
     public function createAction($action = 'edit')
     {
         $id = (int)Request::get('id');
@@ -99,13 +98,11 @@ class RebateController extends AuditController
         ], 'create');
     }
 
-    // 编辑促销
     public function editAction()
     {
         return $this->createAction();
     }
 
-    // 显示促销
     public function showAction()
     {
         return $this->createAction('show');
@@ -116,17 +113,13 @@ class RebateController extends AuditController
         if (Request::method() == 'POST') {
             $file = Request::file('file');
             if ($file->isValid()) {
-                $types = DB::table('customer_order_type')->get()->keyBy('name');
-
                 /*
                 [0] => 客户编码
                 [1] => 客户名称
                 [2] => 金额
                 */
-
                 $rows = readExcel($file->getPathName());
                 $items = [];
-
                 $codes = [];
                 foreach($rows as $i => $row) {
                     if ($i > 1) {
@@ -155,7 +148,6 @@ class RebateController extends AuditController
         return view('importExcel');
     }
 
-    // 删除促销
     public function deleteAction()
     {
         if (Request::method() == 'POST') {

app/Gdoo/CustomerCost/Controllers/ReportController.php

@@ -66,14 +66,7 @@ class ReportController extends DefaultController
                 }
             }
 
-            // 销售会计审核日期
-            $rows = $model->leftJoin(DB::raw("(select max(d.updated_at) as audit_date, m.data_id
-                FROM model_run_log as d left join model_run as m on d.run_id = m.id where m.bill_id = 23 and d.run_name = '销售会计'
-                GROUP BY m.data_id
-            ) as l
-            "), 'l.data_id', '=', 'm.id')
-            ->whereRaw("(".sql_year_month('l.audit_date', 'ts')." BETWEEN ? AND ?)", $fields['date'])
-            ->orderBy(DB::raw(sql_year_month('l.audit_date', 'ts')), 'asc')
+            $rows = $model->orderBy('m.id', 'asc')
             ->get()->toArray();
 
             foreach($rows as &$row) {