后端报表，退货流水报表优化

app/admin/controller/Report.php

@@ -1130,7 +1130,8 @@ class Report extends Base
             ->where($where)
             ->leftJoin('order_num on', 'on.orderCode=s.orderCode')
             ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo')
-            ->leftJoin('result_info ri', 'ri.result_code=s.error_code')
+            ->leftJoin('good_basic gb', 'gb.spuCode=po.spuCode AND gb.is_del=0')
+            ->leftJoin('result_info ri', 'ri.result_code=s.error_code AND ri.is_del=0')
             ->count('s.id');
 
         $list = Db::name('sale_return')
@@ -1139,8 +1140,8 @@ class Report extends Base
             ->where($where)
             ->leftJoin('order_num on', 'on.orderCode=s.orderCode')
             ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo')
-            ->leftJoin('good_basic gb', 'gb.spuCode=po.spuCode')
-            ->leftJoin('result_info ri', 'ri.result_code=s.error_code')
+            ->leftJoin('good_basic gb', 'gb.spuCode=po.spuCode AND gb.is_del=0')
+            ->leftJoin('result_info ri', 'ri.result_code=s.error_code AND ri.is_del=0')
             ->page($param['page'], $param['size'])
             ->cursor();
 
@@ -1181,8 +1182,8 @@ class Report extends Base
             ->where($where)
             ->leftJoin('order_num on', 'on.orderCode=s.orderCode')
             ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo')
-            ->leftJoin('good_basic gb', 'gb.spuCode=po.spuCode')
-            ->leftJoin('result_info ri', 'ri.result_code=s.error_code')
+            ->leftJoin('good_basic gb', 'gb.spuCode=po.spuCode AND gb.is_del=0')
+            ->leftJoin('result_info ri', 'ri.result_code=s.error_code AND ri.is_del=0')
             ->cursor();
 
         $data = [];