|
@@ -1996,15 +1996,10 @@ class Consult extends Base
|
|
|
list($place['provice_code'],$place['city_code'],$place['area_code'])=explode(",",$value['origin_place']);
|
|
|
}
|
|
|
$value['origin_addr']=GetAddr(json_encode($place));
|
|
|
-// if($value['origin_place']!=''){
|
|
|
-// $code = explode(",",$value['origin_place']);
|
|
|
-// $temp=[];
|
|
|
-// $temp['provice_code']=isset($code[0])?$code[0]:"";
|
|
|
-// $temp['city_code']=isset($code[1])?$code[1]:"";
|
|
|
-// $temp['area_code']=isset($code[2])?$code[2]:"";
|
|
|
-// $addr= GetAddr(json_encode($temp));
|
|
|
-// $value['origin_addr'] = $addr;
|
|
|
-// }
|
|
|
+ $tax = TaxCategory::where(['id'=>$value['tax_id']])->findOrEmpty();
|
|
|
+ $value['tax_short_name'] =$tax['short_name']??'';
|
|
|
+ $value['tax_name'] =$tax['cat_name']??'';
|
|
|
+ $value['tax_code'] =$tax['merge_code']??'';
|
|
|
$good_info = Db::name('good_basic')
|
|
|
->field('id,createrid,creater')
|
|
|
->where('is_del',0)
|