|
@@ -111,6 +111,8 @@ class Orderback extends \app\BaseController
|
|
|
$info['sale_price']=$orderinfo['sale_price'];
|
|
|
$info['order_type']=$orderinfo['order_type'];
|
|
|
$info['total_price']=$orderinfo['total_price'];
|
|
|
+ $info['companyNo']=$orderinfo['supplierNo'];
|
|
|
+ $info['company'] = Db::name('business')->where(['companyNo' => $orderinfo['supplierNo'], 'is_del' => 0])->value('company','');
|
|
|
$info['addr_cn']=GetAddr($info['addr_code']);
|
|
|
if($orderinfo['order_type']==3|| $orderinfo['order_type']==4){
|
|
|
$goon = Db::name("good_zixun")->where(["spuCode"=>$orderinfo['good_code'],"is_del"=>0])->find();
|
|
@@ -121,9 +123,7 @@ class Orderback extends \app\BaseController
|
|
|
if (empty($goon)) {
|
|
|
return error_show(1003, "未找到商品数据");
|
|
|
}
|
|
|
- if (empty($goon)) {
|
|
|
- return error_show(1003, "未找到商品数据");
|
|
|
- }
|
|
|
+
|
|
|
$retutninfo = Db::name("order_return")->where(['returnCode'=>$info['returnCode']])->find();
|
|
|
$info['apply_id'] = $retutninfo['apply_id'];
|
|
|
$info['apply_name'] = $retutninfo['apply_name'];
|