|
@@ -1739,7 +1739,7 @@ class Fullorderexcel extends Start_Controller {
|
|
|
$smt_ret = $this->_datahz($where.$wid.' and '.$excelshop,'id,'.$feq,$order_str,'fullordersmt',$extra);
|
|
$smt_ret = $this->_datahz($where.$wid.' and '.$excelshop,'id,'.$feq,$order_str,'fullordersmt',$extra);
|
|
|
$amz_ret = $this->_datahz($where.$wid.' and '.$excelshop,'id,'.$feq,$order_str,'fullorderamz',$extra);
|
|
$amz_ret = $this->_datahz($where.$wid.' and '.$excelshop,'id,'.$feq,$order_str,'fullorderamz',$extra);
|
|
|
|
|
|
|
|
- $info_list = $dlz_ret['info_list']+$tt_ret['info_list']+$smt_ret['info_list']+$amz_ret['info_list'];
|
|
|
|
|
|
|
+ $info_list = array_merge( $dlz_ret['info_list'],$tt_ret['info_list'],$smt_ret['info_list'],$amz_ret['info_list']);
|
|
|
$shouldmoney = $dlz_ret['shouldmoney']+$tt_ret['shouldmoney']+$smt_ret['shouldmoney']+$amz_ret['shouldmoney'];
|
|
$shouldmoney = $dlz_ret['shouldmoney']+$tt_ret['shouldmoney']+$smt_ret['shouldmoney']+$amz_ret['shouldmoney'];
|
|
|
|
|
|
|
|
|
|
|