|
|
@@ -1734,11 +1734,13 @@ class Fullorderexcel extends Start_Controller {
|
|
|
'usp'=>$usp,
|
|
|
'sku9610'=>$sku9610,
|
|
|
];
|
|
|
- $dlz_ret = $this->_datahz($where.$wid.' and '.$excelshop,'id,'.$feq,$order_str,'fullorder',$extra);
|
|
|
- $tt_ret = $this->_datahz($where.$wid.' and '.$excelshop,'id,'.$feq,$order_str,'fullordertt',$extra);
|
|
|
- $smt_ret = $this->_datahz($where.$wid.' and '.$excelshop,'id,'.$feq,$order_str,'fullordersmt',$extra);
|
|
|
+ // $dlz_ret = $this->_datahz($where.$wid.' and '.$excelshop,'id,'.$feq,$order_str,'fullorder',$extra);
|
|
|
+ // $tt_ret = $this->_datahz($where.$wid.' and '.$excelshop,'id,'.$feq,$order_str,'fullordertt',$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);
|
|
|
-
|
|
|
+ echo "<pre>";
|
|
|
+ print_r($amz_ret);
|
|
|
+ die;
|
|
|
$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'];
|
|
|
|
|
|
@@ -1977,11 +1979,16 @@ class Fullorderexcel extends Start_Controller {
|
|
|
}
|
|
|
if(isset($value['pay']))
|
|
|
{
|
|
|
- if($sj =='fullorder'){
|
|
|
- $pay = $this->typeclass->read($value['pay']);
|
|
|
- $info_list[$key]['pay'] = $pay['title'];
|
|
|
+ if(empty($value['pay'])){
|
|
|
+ $info_list[$key]['pay'] = "";
|
|
|
+ }else{
|
|
|
+ if($sj =='fullorder'){
|
|
|
+ $pay = $this->typeclass->read($value['pay']);
|
|
|
+ $info_list[$key]['pay'] = $pay['title'];
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
+
|
|
|
}
|
|
|
if(isset($value['type']))
|
|
|
{
|
