From 312bbdba959706afc00c300ba6ee41b8dd3d9f99 Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Thu, 25 Nov 2021 11:33:02 +0800
Subject: [PATCH] admin_liche_1125

---
 admin/controllers/receiver/Orders.php | 16 ++++++++++------
 admin/libraries/OrdersList.php        | 12 ++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/admin/controllers/receiver/Orders.php b/admin/controllers/receiver/Orders.php
index d8e61247..7874a084 100644
--- a/admin/controllers/receiver/Orders.php
+++ b/admin/controllers/receiver/Orders.php
@@ -43,7 +43,11 @@ class Orders extends HD_Controller
             }
             $cate = $where = array();
             $t2 = 'lc_receiver_orders';
-            $where_c = ["$t2.status>=" => 0];
+            if ($key == 7) {
+                $where_c = ["$t2.status<>" => -1];
+            } else {
+                $where_c = ["$t2.status not in(-1,7)" => null];
+            }
             $where_c["{$t2}.brand_id<>3"] = null;//狸车品牌不显示
             $where_c["{$t2}.biz_id<>1"] = null;//biz_id=1不显示
             if ($key == 6 || $key == 7) {
@@ -380,12 +384,12 @@ class Orders extends HD_Controller
         $params['page'] = 1;
         $params['size'] = 10000;
         $indexs = [];
-        if($params['export_type']){
+        if ($params['export_type']) {
             $result = $this->orderslist->export_data($params['status_pid'], $params);
             $fileName = '保险明细';
             $data = $result['data'];
             $indexs = $result['indexs'];
-        }else{
+        } else {
             $fieldAry = $this->orderslist->get_fields($params['status_pid'], 1);
             foreach ($fieldAry as $key => $value) {
                 $indexs[$key] = $value['title'];
@@ -634,9 +638,9 @@ class Orders extends HD_Controller
             'status' => 1,
             'pay_price!=' => 0
         ];
-        $sum = $this->app_liche_orders_model->sum('total_price',$where); //已收金额
+        $sum = $this->app_liche_orders_model->sum('total_price', $where); //已收金额
         $need_price = $this->orders_entity->recevable_price($oid); //应收金额
-        if($sum['total_price'] < $need_price){
+        if ($sum['total_price'] < $need_price) {
             return $this->show_json(SYS_CODE_FAIL, '修改失败,已收金额小于应收金额!');
         }
         $this->order_bills_model->update(['status' => 2], ['o_id' => $oid]);
@@ -770,7 +774,7 @@ class Orders extends HD_Controller
                     ];
                 }
             }
-            $sum = $this->app_liche_orders_model->sum('total_price',$where);
+            $sum = $this->app_liche_orders_model->sum('total_price', $where);
             $this->data['pay_price'] = $sum['total_price'];
             $this->data['need_price'] = $this->orders_entity->recevable_price($params['id']);
             $this->data['list'] = $list;
diff --git a/admin/libraries/OrdersList.php b/admin/libraries/OrdersList.php
index 366755f6..eddbe291 100644
--- a/admin/libraries/OrdersList.php
+++ b/admin/libraries/OrdersList.php
@@ -299,7 +299,7 @@ class OrdersList
         $t1 = 'lc_receiver_order_signs';
         $t2 = 'lc_receiver_orders';
         $where = [
-            "$t2.status>=" => 0,
+            "$t2.status not in(-1,7)" => null,
             "$t2.biz_id!=" => 1,
         ];
         if ($_SESSION['admin_info']['biz_id']) {
@@ -542,7 +542,7 @@ class OrdersList
         $t1 = 'lc_receiver_order_loans';
         $t2 = 'lc_receiver_orders';
         $where = [
-            "$t2.status>=" => 0,
+            "$t2.status not in(-1,7)" => null,
             "$t2.biz_id!=" => 1,
         ];
         if ($_SESSION['admin_info']['biz_id']) {
@@ -729,7 +729,7 @@ class OrdersList
         $t1 = 'lc_receiver_order_ckcars';
         $t2 = 'lc_receiver_orders';
         $where = [
-            "$t2.status>=" => 0,
+            "$t2.status not in(-1,7)" => null,
             "$t2.biz_id!=" => 1,
         ];
         if ($_SESSION['admin_info']['biz_id']) {
@@ -934,7 +934,7 @@ class OrdersList
         $t1 = 'lc_receiver_order_bills';
         $t2 = 'lc_receiver_orders';
         $where = [
-            "$t2.status>=" => 0,
+            "$t2.status not in(-1,7)" => null,
             "$t2.biz_id!=" => 1,
         ];
         if ($_SESSION['admin_info']['biz_id']) {
@@ -1150,7 +1150,7 @@ class OrdersList
         $t1 = 'lc_receiver_order_agents';
         $t2 = 'lc_receiver_orders';
         $where = [
-            "$t2.status>=" => 0,
+            "$t2.status not in(-1,7)" => null,
             "$t2.biz_id!=" => 1,
         ];
         if ($_SESSION['admin_info']['biz_id']) {
@@ -1355,7 +1355,7 @@ class OrdersList
         $t1 = 'lc_receiver_order_deliverys';
         $t2 = 'lc_receiver_orders';
         $where = [
-            "$t2.status>=" => 0,
+            "$t2.status not in(-1,7)" => null,
             "$t2.biz_id!=" => 1,
         ];
         if ($_SESSION['admin_info']['biz_id']) {