修复内容

application/admin/logic/OrderautoLogic.php

@@ -14,7 +14,9 @@ class OrderautoLogic{
     public static function lists($get){
         $where = [];
         //判断已经支付的订单
-        $where[] = ['pay_status', '=', 1];
+//        $where[] = ['pay_status', '=', 1];
+        $where[] = ['refund_status', '=', 0];
+        $where[] = ['del', '=', 0];
         if(isset($get['type']) && $get['type'] != ''){
            $where[] = ['static','=',$get['type']];
         }
@@ -38,10 +40,8 @@ class OrderautoLogic{
             $where[] = ['status','=',$get['status']];
         }
         
-        // 执行状态查询
-        if(isset($get['admin']) && $get['admin']!= ''){
-            $where[] = ['admin_id','=',$get['admin']];
-        }        
+        // 如果订单的admin_id不等于空，不需要限制支付状态；如果admin_id等于空，只查询已支付的订单
+        $where[] = ['', 'exp', Db::raw("(admin_id IS NOT NULL AND admin_id != '') OR pay_status = 1")];
         // 订单的来源查询
         if(isset($get['pid']) && $get['pid']!= ''){
             $where[] = ['channel_id','=',$get['pid']];