|
@@ -1343,7 +1343,12 @@ class Fullorder extends Start_Controller {
|
|
|
$arg_array = $arg_array[0];$fpdata = array();
|
|
$arg_array = $arg_array[0];$fpdata = array();
|
|
|
$fullorder = $this->fullorder->read($arg_array);
|
|
$fullorder = $this->fullorder->read($arg_array);
|
|
|
$returngoods = $this->returngoods->get_orderinfo($fullorder['orderinfo']);
|
|
$returngoods = $this->returngoods->get_orderinfo($fullorder['orderinfo']);
|
|
|
- $this->data['returngoods'] = $returngoods?1:0;
|
|
|
|
|
|
|
+ $this->data['returngoods'] = 0;
|
|
|
|
|
+ if(!empty($returngoods)){
|
|
|
|
|
+ if($returngoods['status'] == 120){
|
|
|
|
|
+ $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');//所有快递配置信息
|
