|
|
@@ -241,8 +241,8 @@ class After extends \app\BaseController
|
|
|
$info['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
|
|
|
$info['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
|
|
|
$customer=[];
|
|
|
- if(isset($wsmcode['companyNo'])&&$wsmcode['companyNo']!=''){
|
|
|
- $customer = Db::name("business")->field('id,company,companyNo')->where(["companyNo"=>$wsmcode['companyNo']])->find();
|
|
|
+ if(isset($orderinfo['supplierNo'])&&$orderinfo['supplierNo']!=''){
|
|
|
+ $customer = Db::name("business")->field('id,company,companyNo')->where(["companyNo"=>$orderinfo['supplierNo']])->find();
|
|
|
}
|
|
|
|
|
|
$info['customer_name'] = isset($customer['company']) ?trim($customer['company']):'';
|
|
|
@@ -261,6 +261,8 @@ class After extends \app\BaseController
|
|
|
// $info['addr'] = $wsmcode['addr'];//地址
|
|
|
$info['spuCode'] = $orderinfo['good_code'];//地址
|
|
|
$info['skuCode'] = $orderinfo['skuCode'];//地址
|
|
|
+ $info['return_tag'] = $info['return_tag']==0?"":$info['return_tag'];//地址
|
|
|
+ $info['is_th'] = $info['is_th']==0?"":$info['is_th'];//地址
|
|
|
|
|
|
return app_show(0,"获取成功",$info);
|
|
|
}
|
