wugg 7 mēneši atpakaļ
vecāks
revīzija
a2a4c5205e

+ 4 - 2
app/admin/controller/Consult.php

@@ -2020,8 +2020,7 @@ class Consult extends Base
                     "mark_fee"=>$value["mark_fee"],
                     "nake_fee"=>$value["nake_fee"],
                     "cert_fee"=>$value["cert_fee"],
-                   "cost_fee"=>$value["sale_cost_fee"]!=$value['origin_cost_fee']? $value["sale_cost_fee"]: $value["cost_fee"],
-                    //暂时注掉,搞不清楚原因@吴广广
+                    "cost_fee"=>$value["sale_cost_fee"]!=$value['origin_cost_fee']? $value["sale_cost_fee"]: $value["cost_fee"],
                     "num"=>$bidinfo["num"],
                 ];
 
@@ -2038,6 +2037,9 @@ class Consult extends Base
             $value['specinfo'] = json_decode($value['specinfo'],true);
             $value['metal_name']=isset($value['metal_id'])&& $value['metal_id']!=0?$this->noble[$value['metal_id']]:"";
             $value['bargain_status']=$bidinfo['bargain_status'];
+            $value['info_status']=$bidinfo['status']??"";
+
+
 
             //reject驳回原因,status==5表示驳回
             $value['reject']=[];

+ 0 - 5
app/admin/controller/OrderOutChild.php

@@ -161,16 +161,11 @@ class OrderOutChild extends Base
             ->where($condition)
             ->select()
             ->toArray();
-
-//        $all_apply_id = array_column($list, 'apply_id');
-//        $company_name = get_company_name_by_uid($all_apply_id);
-
         //校验是否开通了供应商账号
         $supp_account = checkHasAccountBySupplierNos(array_unique(array_column($list, 'supplierNo')));
 
         $data = [];
         foreach ($list as $value) {
-//            $value['company_name'] = $company_name[$value['apply_id']] ?? '';
             $value['has_account'] = (int)isset($supp_account[$value['supplierNo']]);
             $data[] = $value;
         }