Browse Source

产品导出优化

wufeng 2 years ago
parent
commit
26cbc2e76f
1 changed files with 27 additions and 3 deletions
  1. 27 3
      app/admin/controller/Report.php

+ 27 - 3
app/admin/controller/Report.php

@@ -18,7 +18,7 @@ class Report extends Base
         $val = Validate::rule([
             'date|筛选时间' => 'require|date',
             'platform_id|筛选平台ID' => 'require|number|gt:0',
-            'status|状态' => 'require|number|between:1,8',
+            'status|状态' => 'require|number|in:5,6,8',
         ]);
 
         if (!$val->check($param)) return error_show(1004, $val->getError());
@@ -87,10 +87,34 @@ class Report extends Base
             $value['三级分类'] = isset($all_cat[$value['三级分类']]['cat_name_3']) ? $all_cat[$value['三级分类']]['cat_name_3'] : '';
 
             $temp = explode(',', $value['产地']);
-            $value['产地'] = GetAddr(json_encode(['provice_code' => $temp[0], 'city_code' => $temp[1], 'area_code' => $temp[2]]));
+            $value['产地'] = GetAddr(json_encode(['provice_code' => isset($temp[0]) ? $temp[0] : '', 'city_code' => isset($temp[1]) ? $temp[1] : '', 'area_code' => isset($temp[2]) ? $temp[2] : '']));
             $value['计量单位'] = isset($all_unit[$value['计量单位']]) ? $all_unit[$value['计量单位']] : '';
             $temp_2 = explode(',', $value['发货地']);
-            $value['发货地'] = GetAddr(json_encode(['provice_code' => $temp_2[0], 'city_code' => $temp_2[1], 'area_code' => $temp_2[2]]));
+            $value['发货地'] = GetAddr(json_encode(['provice_code' => isset($temp_2[0]) ? $temp_2[0] : '', 'city_code' => isset($temp_2[1]) ? $temp_2[1] : '', 'area_code' => isset($temp_2[2]) ? $temp_2[2] : '']));
+
+            $value['型号'] = Db::name('good_spec')
+                ->alias('gp')
+                ->field('')
+                ->leftJoin('specs s', 's.id=gp.spec_id AND s.is_del=0')
+                ->leftJoin('spec_value sv', 'sv.id=gp.spec_value_id AND s.is_del=0')
+                ->where([
+                    'gp.spuCode' => $value['spuCode'],
+                    'gp.is_del' => 0,
+                    's.spec_name' => '型号',
+                ])
+                ->value('sv.spec_value', '');
+
+            $value['响应时间'] = Db::name('good_spec')
+                ->alias('gp')
+                ->field('')
+                ->leftJoin('specs s', 's.id=gp.spec_id AND s.is_del=0')
+                ->leftJoin('spec_value sv', 'sv.id=gp.spec_value_id AND s.is_del=0')
+                ->where([
+                    'gp.spuCode' => $value['spuCode'],
+                    'gp.is_del' => 0,
+                    's.spec_name' => '响应时间',
+                ])
+                ->value('sv.spec_value', '');
 
             unset($value['spuCode']);
         }