|
@@ -130,11 +130,11 @@ class Returngoodsexcel extends Start_Controller {
|
|
$tmp['退款金额'] = $value['back_money'];
|
|
$tmp['退款金额'] = $value['back_money'];
|
|
$tmp['登记人'] = $value['recorder'];
|
|
$tmp['登记人'] = $value['recorder'];
|
|
$tmp['登记时间'] = $value['create_time'];
|
|
$tmp['登记时间'] = $value['create_time'];
|
|
- $tmp_info = $this->logic_order->getInfoByType($value['table_type'],$number);
|
|
|
|
|
|
+ $tmp_info = $this->logic_order->getInfoByType($value['table_type'],$value['number']);
|
|
$tmp['仓库品名'] = isset($tmp_info['shipremarks'])?$tmp_info['shipremarks']:" ";
|
|
$tmp['仓库品名'] = isset($tmp_info['shipremarks'])?$tmp_info['shipremarks']:" ";
|
|
if(isset($tmp_info['express'])){
|
|
if(isset($tmp_info['express'])){
|
|
$express = $tmp_info['express'];
|
|
$express = $tmp_info['express'];
|
|
- $tmp['快递方式'] = isset($express_tran[$express])?$express_tran[$express]:"快递异常";
|
|
|
|
|
|
+ $tmp['快递方式'] = isset($express_tran[$express])?$express_tran[$express]:"无";
|
|
}else{
|
|
}else{
|
|
$tmp['快递方式'] = " 无";
|
|
$tmp['快递方式'] = " 无";
|
|
}
|
|
}
|