报备单细节优化

app/abutment/controller/Sale.php

@@ -129,7 +129,7 @@ class Sale extends HomeBaseController
                 }
                 $addr['addr_cn'] = GetAddr(json_encode($addinfo));
             }
-            if ($value['order_type'] == 3) {
+            if ($value['order_type'] == 3 || $value['order_type'] == 4) {
                 $goon = Db::name("good_zixun")->field('id,cat_id')->where(["spuCode" => $value['good_code'], "is_del" => 0])->find();
             } else {
                 $goon = Db::name('good_platform')->field('a.id,b.cat_id')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')->where(['a.skuCode' => $value['skuCode']])->find();

app/abutment/logic/Filing.php

@@ -27,7 +27,7 @@ class Filing
             ->count('id');
 
         $list = Db::name('filing')
-            ->field('id,filingCode,cat_id,good_name,num,good_img,price,expect_service,companyName,companyCode,status,addtime,"" catinfo,orderCode')
+            ->field('id,filingCode,cat_id,good_name,num,good_img,price,expect_service,companyName,companyCode,status,addtime,"" catinfo,orderCode,cgd_charge')
             ->where($where)
             ->page($data['page'], $data['size'])
             ->order('id', 'desc')
@@ -39,10 +39,9 @@ class Filing
 
         $all_cat = [];
         foreach ($list as &$value) {
-            if (!isset($all_cat[$value['cat_id']])) {
-                $value['catinfo'] = $all_cat[$value['cat_id']] = implode('/', array_column(made($value['cat_id']), 'name'));
+            if (!isset($all_cat[$value['cat_id']])) $all_cat[$value['cat_id']] = implode('/', array_column(made($value['cat_id']), 'name'));
 
-            }
+            $value['catinfo'] = $all_cat[$value['cat_id']];
         }
 
         return json_show(0, '获取报备单列表成功', ['count' => $count, 'list' => $list]);