From 44c3a9042266d2cdcfcdf92ed17b846223e49f8d Mon Sep 17 00:00:00 2001
From: lccsw <1127794702@qq.com>
Date: Wed, 13 Oct 2021 14:25:45 +0800
Subject: [PATCH] edit-admin-filter biz_id=1

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

diff --git a/admin/controllers/receiver/Orders.php b/admin/controllers/receiver/Orders.php
index 61b1ae8a..3d3fb072 100644
--- a/admin/controllers/receiver/Orders.php
+++ b/admin/controllers/receiver/Orders.php
@@ -45,6 +45,7 @@ class Orders extends HD_Controller
             $t2 = 'lc_receiver_orders';
             $where_c = ["$t2.id>" => 0];
             $where_c["{$t2}.brand_id<>3"] = null;//狸车品牌不显示
+            $where_c["{$t2}.biz_id<>1"] = null;//biz_id=1不显示
             if ($key == 6) {
                 $count1 = $this->orders_model->count(array("status" => 6, "brand_id<>3" => null));
             } else {
@@ -476,7 +477,7 @@ class Orders extends HD_Controller
                     $this->order_deliverys_model->add(['o_id' => $oid, 'c_time' => time]);
                 }
             }else{
-                $this->orders_model->update(['status' => 3], ['id' => $row['o_id']]);
+                $this->orders_model->update(['status' => 2], ['id' => $row['o_id']]);
                 $ckcar = $this->order_ckcars_model->get(['o_id' => $row['o_id']]);
                 $replace = [
                     'o_id' => $row['o_id'],
@@ -541,7 +542,7 @@ class Orders extends HD_Controller
         if (!$row) {
             return $this->show_json(SYS_CODE_FAIL, '参数错误!');
         }
-        if (!$bill) {
+        if (!$bill && $row['status']>=3) {
             $add_data = [
                 'o_id' => $row['id'],
                 'c_time' => time()
diff --git a/admin/libraries/OrdersList.php b/admin/libraries/OrdersList.php
index 452f2a1f..b73d4ad6 100644
--- a/admin/libraries/OrdersList.php
+++ b/admin/libraries/OrdersList.php
@@ -85,6 +85,7 @@ class OrdersList
             $_title = '全部订单';
             $view = 'receiver/orders/lists';
         }
+        $where['biz_id!='] = 1;
         if ($params['cf_title']) {
             $where['rid in (select id from lc_receiver_customers where cf_title = "' . $params['cf_title'] . '")'] = null;
         }
@@ -239,6 +240,7 @@ class OrdersList
         $t2 = 'lc_receiver_orders';
         $where = [
             "$t2.status>=" => 0,
+            "$t2.biz_id!=" => 1,
         ];
         if ($params['cf_title']) {
             $where[$t2.'.rid in (select id from lc_receiver_customers where cf_title = "' . $params['cf_title'] . '")'] = null;
@@ -433,6 +435,7 @@ class OrdersList
         $t2 = 'lc_receiver_orders';
         $where = [
             "$t2.status>=" => 0,
+            "$t2.biz_id!=" => 1,
         ];
         if ($params['cf_title']) {
             $where[$t2.'.rid in (select id from lc_receiver_customers where cf_title = "' . $params['cf_title'] . '")'] = null;
@@ -581,6 +584,7 @@ class OrdersList
         $t2 = 'lc_receiver_orders';
         $where = [
             "$t2.status>=" => 0,
+            "$t2.biz_id!=" => 1,
         ];
         if ($params['cf_title']) {
             $where[$t2.'.rid in (select id from lc_receiver_customers where cf_title = "' . $params['cf_title'] . '")'] = null;
@@ -747,6 +751,7 @@ class OrdersList
         $t2 = 'lc_receiver_orders';
         $where = [
             "$t2.status>=" => 0,
+            "$t2.biz_id!=" => 1,
         ];
         if ($params['cf_title']) {
             $where[$t2.'.rid in (select id from lc_receiver_customers where cf_title = "' . $params['cf_title'] . '")'] = null;
@@ -913,6 +918,7 @@ class OrdersList
         $t2 = 'lc_receiver_orders';
         $where = [
             "$t2.status>=" => 0,
+            "$t2.biz_id!=" => 1,
         ];
         if ($params['cf_title']) {
             $where[$t2.'.rid in (select id from lc_receiver_customers where cf_title = "' . $params['cf_title'] . '")'] = null;
@@ -1079,6 +1085,7 @@ class OrdersList
         $t2 = 'lc_receiver_orders';
         $where = [
             "$t2.status>=" => 0,
+            "$t2.biz_id!=" => 1,
         ];
         if ($params['cf_title']) {
             $where[$t2.'.rid in (select id from lc_receiver_customers where cf_title = "' . $params['cf_title'] . '")'] = null;