|
@@ -1663,16 +1663,15 @@ class Consult extends Base
|
|
|
if($status===''){
|
|
|
return error_show(1005,"参数status不能为空");
|
|
|
}
|
|
|
-// $catinfo = Db::name("cat")->where(["id"=>$bids['cat_id']])->find();
|
|
|
-
|
|
|
- $tmp = Db::name('consult_order')
|
|
|
+ $adjunct = isset($this->post['adjunct'])&& $this->post['adjunct']!=='' ? trim($this->post['adjunct']):"";
|
|
|
+ $tmp = Db::name('consult_order')
|
|
|
->field('id,companyNo,platform_code')
|
|
|
->where(['is_del'=>0,'zxNo'=>$bids['zxNo']])
|
|
|
->findOrEmpty();
|
|
|
|
|
|
$catinfo = get_budget($bids['cat_id'],$tmp['companyNo']??'',$tmp['platform_code']??0,true);
|
|
|
|
|
|
- $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']:0;
|
|
|
+// $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']:0;
|
|
|
$rate = isset($catinfo['rate']) ? $catinfo['rate']/100:0; //业务主管利率
|
|
|
if($bids['is_gold_price']==1){
|
|
|
$gold = Db::name("gold_price1")->where(["type"=>$bids['metal_id'],"is_del"=>0,"status"=>1])->order("addtime desc")
|
|
@@ -1698,6 +1697,7 @@ class Consult extends Base
|
|
|
if($status==1){
|
|
|
if($info['after_price']<$rate_price){
|
|
|
$info['status']=3;
|
|
|
+ if($adjunct=='') return error_show(1005,"越线通过附件不能为空");
|
|
|
}
|
|
|
}
|
|
|
$remark = isset($this->post['remark'])&& $this->post['remark']!=""?trim($this->post['remark']):"";
|
|
@@ -1707,8 +1707,9 @@ class Consult extends Base
|
|
|
try{
|
|
|
$examinfo = isset($info['exam_info'])&&$info['exam_info']!="" ? json_decode($info['exam_info'],true):[];
|
|
|
$examinfo[]=["status"=>$status,"info_status"=>$ra_status,"remark"=>$remark,"createrid"=>$createrid, "creater"=>$creater];
|
|
|
-// $info['status'] =$status;
|
|
|
+
|
|
|
$info['remark'] =$remark;
|
|
|
+ $info['adjunct'] =$adjunct;
|
|
|
$info['exam_info']=json_encode($examinfo) ;
|
|
|
$info['updatetime'] =date("Y-m-d H:i:s");
|
|
|
$up =Db::name("bargain_order")->save($info);
|