Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/SaleReport.php

@@ -385,7 +385,7 @@ class SaleReport extends Base
     {
         $param = $this->request->only(['token', 'start_date' => '', 'end_date' => '', 'start_arrive_date' => '', 'end_arrive_date' => '', 'page' => 1, 'size' => 15], 'post', 'trim');
 
-        $where = [['s.is_del', '=', 0]];
+        $where = [['s.is_del', '=', 0], ['out.status', '=', 1]];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['s.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
         if ($param['start_arrive_date'] != '' && $param['end_arrive_date'] != '') $where[] = ['s.arrive_time', 'between', [$param['start_arrive_date'] . ' 00:00:00', $param['end_arrive_date'] . ' 23:59:59']];
 
@@ -436,7 +436,7 @@ class SaleReport extends Base
             $list[] = $value;
         }
 
-        return app_show(0, '请求成功', ['list' => $list, 'count' => $count]);
+        return app_show(0, '请求成功', ['count' => $count, 'list' => $list]);
 
     }
 
@@ -445,7 +445,7 @@ class SaleReport extends Base
     {
         $param = $this->request->only(['token', 'start_date' => '', 'end_date' => '', 'start_arrive_date' => '', 'end_arrive_date' => ''], 'post', 'trim');
 
-        $where = [['s.is_del', '=', 0]];
+        $where = [['s.is_del', '=', 0], ['out.status', '=', 1]];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['s.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
         if ($param['start_arrive_date'] != '' && $param['end_arrive_date'] != '') $where[] = ['s.arrive_time', 'between', [$param['start_arrive_date'] . ' 00:00:00', $param['end_arrive_date'] . ' 23:59:59']];
 
@@ -624,7 +624,7 @@ class SaleReport extends Base
 
         $param = $this->request->only(['token', 'start_date' => '', 'end_date' => '', 'status' => '', 'page' => 1, 'size' => 15], 'post', 'trim');
 
-        $where = [];
+        $where = [['or.is_del','=',0]];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['or.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
         if ($param['status'] != '') $where[] = ['or.status', '=', $param['status']];
 
@@ -678,7 +678,7 @@ class SaleReport extends Base
 
         $param = $this->request->only(['token', 'start_date' => '', 'end_date' => '', 'status' => ''], 'post', 'trim');
 
-        $where = [];
+        $where = [['or.is_del','=',0]];
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['or.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
         if ($param['status'] != '') $where[] = ['or.status', '=', $param['status']];
 
@@ -968,7 +968,7 @@ class SaleReport extends Base
         foreach ($data as $value) {
 
             if ($value['order_type'] == 3) $noble_metal = Db::name("good_zixun")->where(["spuCode" => $value['spuCode'], "is_del" => 0])->value('noble_metal');
-            else $noble_metal = Db::name('good_basic')->where(['spuCode' => $value['spuCode']])->value('noble_metal');
+            else $noble_metal = Db::name('good_basic')->where(['spuCode' => $value['spuCode'], 'is_del' => 0])->value('noble_metal');
 
 
             $value['apply_company'] = get_company_name_by_uid($value['apply_id']);
@@ -1009,7 +1009,7 @@ class SaleReport extends Base
         foreach ($data as $value) {
 
             if ($value['order_type'] == 3) $noble_metal = Db::name("good_zixun")->where(["spuCode" => $value['spuCode'], "is_del" => 0])->value('noble_metal');
-            else $noble_metal = Db::name('good_basic')->where(['spuCode' => $value['spuCode']])->value('noble_metal');
+            else $noble_metal = Db::name('good_basic')->where(['spuCode' => $value['spuCode'], 'is_del' => 0])->value('noble_metal');
 
             $value['部门'] = get_company_name_by_uid($value['apply_id']);
             $value['销售部门'] = get_company_name_by_uid($value['sale_apply_id']);