From abae1d02ec1686e43ba71372624096c9233bc90d Mon Sep 17 00:00:00 2001
From: lccsw <805383944@qq.com>
Date: Thu, 31 Mar 2022 11:30:42 +0800
Subject: [PATCH] edit-admin-order_list

---
 admin/controllers/receiver/orderv2/Orders.php | 2 ++
 admin/libraries/Ordersv2List.php              | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/admin/controllers/receiver/orderv2/Orders.php b/admin/controllers/receiver/orderv2/Orders.php
index 1059e7e4..5245154f 100644
--- a/admin/controllers/receiver/orderv2/Orders.php
+++ b/admin/controllers/receiver/orderv2/Orders.php
@@ -62,6 +62,7 @@ class Orders extends HD_Controller
                     if($key2){
                         $where_s = [];
                         $key==1 && $where_s["{$t1}.payway"] = 0;//分期
+                        $key==3 && $where_s["{$t1}.id in (select o_id from lc_app_liche_orders where status=1 group by o_id)"] = null;
                         if($key2){
                             $where_s["{$t2}.pid_status"] = $value['pid_status'];
                             $up_key = $key2+1;
@@ -74,6 +75,7 @@ class Orders extends HD_Controller
                             "id not in (select o_id from lc_receiver_order_status where pid_status={$value['pid_status']} and status=1)" => null
                         ];
                         $key==1 && $where_s['payway'] = 0;
+                        $key==3 && $where_s['id in (select o_id from lc_app_liche_orders where status=1 group by o_id)'] = null;
                         $where_s = array_merge($where,$where_s);
                         $count2 = $this->receiver_orders_v2_model->count($where_s);
                     }
diff --git a/admin/libraries/Ordersv2List.php b/admin/libraries/Ordersv2List.php
index 968333cc..b6aeb8a1 100644
--- a/admin/libraries/Ordersv2List.php
+++ b/admin/libraries/Ordersv2List.php
@@ -192,6 +192,9 @@ class Ordersv2List
         $fileds = "{$this->t1}.id,{$this->t1}.name,{$this->t1}.mobile,{$this->t1}.brand_id,{$this->t1}.s_id,{$this->t1}.v_id,
             {$this->t1}.cor_id,{$this->t1}.incor_id,{$this->t1}.money_json,{$this->t1}.payway,{$this->t1}.status,{$this->t1}.c_time,
             {$this->t1}.biz_id,{$this->t1}.bill_time,{$this->t1}.customer_id,{$this->t1}.owner_name,{$this->t1}.owner_mobile,{$this->t1}.main_type,{$this->t1}.info_json";
+        if($params['status_pid']==3){
+            $where["{$this->t1}.id in (select o_id from lc_app_liche_orders where status=1 group by o_id)"] = null;
+        }
         if(strlen($params['status_pid']) && $params['status']){
             $where["{$this->t2}.pid_status"] = $params['status_pid'];
             $up_key = $params['status']+1;