|
@@ -1120,6 +1120,7 @@ class Consult extends Base
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ //选择商品
|
|
|
public function bids_check(){
|
|
|
$bidNo = isset($this->post['bidNo'])&& $this->post['bidNo']!=""?trim($this->post['bidNo']):"";
|
|
|
if($bidNo===""){
|
|
@@ -1158,6 +1159,7 @@ class Consult extends Base
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ //议价审核
|
|
|
public function bargain_status(){
|
|
|
$bargainNo = isset($this->post['bargainNo'])&& $this->post['bargainNo']!=""?trim($this->post['bargainNo']):"";
|
|
|
if($bargainNo===""){
|
|
@@ -1381,7 +1383,7 @@ class Consult extends Base
|
|
|
$count = Db::name('consult_bids')->where($where)->count();
|
|
|
$total = ceil($count / $size);
|
|
|
$page = $page >= $total ? $total : $page;
|
|
|
- $list =Db::name('consult_bids')->where($where)->page($page,$size)->select();
|
|
|
+ $list =Db::name('consult_bids')->where($where)->page($page,$size)->select()->toArray();
|
|
|
$data=[];
|
|
|
foreach ($list as $value){
|
|
|
$catinfo = Db::name("cat")->where(["id"=>$value['cat_id']])->find();
|
|
@@ -1419,7 +1421,12 @@ 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'];
|
|
|
- $data[]=$value;
|
|
|
+
|
|
|
+ //status==5表示驳回,取出驳回原因
|
|
|
+ if ($value['status'] == 5) {
|
|
|
+ $value['reject'] = Db::name('bargain_order')->where(['infoNo' => $infoNo])->whereIn('status', [5, 6])->column('remark');
|
|
|
+ }
|
|
|
+ $data[] = $value;
|
|
|
}
|
|
|
return app_show(0,"获取成功",['count'=>$count,'list'=>$data]);
|
|
|
}
|