|
@@ -1345,10 +1345,11 @@ class Fullorder extends Start_Controller {
|
|
|
$returngoods = $this->returngoods->get_orderinfo($fullorder['orderinfo']);
|
|
$returngoods = $this->returngoods->get_orderinfo($fullorder['orderinfo']);
|
|
|
$this->data['returngoods'] = 0;
|
|
$this->data['returngoods'] = 0;
|
|
|
if(!empty($returngoods)){
|
|
if(!empty($returngoods)){
|
|
|
- if($returngoods['status'] == 120){
|
|
|
|
|
|
|
+ if($returngoods['status'] != 120){
|
|
|
$this->data['returngoods'] = 1;
|
|
$this->data['returngoods'] = 1;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
$fullorder['parameter'] = str_replace(",","---",$fullorder['parameter']);
|
|
$fullorder['parameter'] = str_replace(",","---",$fullorder['parameter']);
|
|
|
$country = $this->country->find_all('1=1','id,name','name asc');//所有国家信息
|
|
$country = $this->country->find_all('1=1','id,name','name asc');//所有国家信息
|
|
|
$express = $this->express->find_all('1=1');//所有快递配置信息
|
|
$express = $this->express->find_all('1=1');//所有快递配置信息
|
