|
|
@@ -1664,6 +1664,7 @@ class Consult extends Base
|
|
|
return error_show(1005,"参数status不能为空");
|
|
|
}
|
|
|
$adjunct = isset($this->post['adjunct'])&& $this->post['adjunct']!=='' ? trim($this->post['adjunct']):"";
|
|
|
+ $adjunct_name = isset($this->post['adjunct_name'])&& $this->post['adjunct_name']!=='' ? trim($this->post['adjunct_name']):"";
|
|
|
$tmp = Db::name('consult_order')
|
|
|
->field('id,companyNo,platform_code')
|
|
|
->where(['is_del'=>0,'zxNo'=>$bids['zxNo']])
|
|
|
@@ -1671,7 +1672,6 @@ class Consult extends Base
|
|
|
|
|
|
$catinfo = get_budget($bids['cat_id'],$tmp['companyNo']??'',$tmp['platform_code']??0,true);
|
|
|
|
|
|
-// $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")
|
|
|
@@ -1706,10 +1706,17 @@ class Consult extends Base
|
|
|
Db::startTrans();
|
|
|
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];
|
|
|
+ $examinfo[]=[
|
|
|
+ "status"=>$status,
|
|
|
+ "info_status"=>$ra_status,
|
|
|
+ "remark"=>$remark,
|
|
|
+ "adjunct"=>$adjunct,
|
|
|
+ "adjunct_name"=>$adjunct_name,
|
|
|
+ "createrid"=>$createrid,
|
|
|
+ "creater"=>$creater
|
|
|
+ ];
|
|
|
|
|
|
$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);
|
|
|
@@ -1890,9 +1897,7 @@ class Consult extends Base
|
|
|
$info['metal_name']=isset($bidinfos['metal_id'])&& $bidinfos['metal_id']!=0?$this->noble[$bidinfos['metal_id']]:"";
|
|
|
// $info['sale_price'] =round($bidinfos['sale_price'],2);//议价前价格
|
|
|
$info['specinfo'] = isset($bidinfos['specinfo'])&&$bidinfos['specinfo']!=""?json_decode($bidinfos['specinfo'],true):[];
|
|
|
-// if($info['status']==2){
|
|
|
- $info['lower_price'] =round($lower_price,2);
|
|
|
-// }
|
|
|
+ $info['lower_price'] =round($lower_price,2);
|
|
|
//获取议价原因
|
|
|
if ($info['result_info_id'] != 0) {
|
|
|
$info['result_info'] = Db::name('result_info')->where(['result_code' => $info['result_info_id'], 'type' => 7, 'status' => 1, 'is_del' => 0])->value('result');
|
