|
|
@@ -5682,13 +5682,13 @@ class Fullordertt extends Start_Controller {
|
|
|
$info_list = $this->db->query('select distinct shop,email from crowd_fullordertt where email != "" and '.$where)->result_array();
|
|
|
foreach ($info_list as $key=>$value)
|
|
|
{
|
|
|
- $k = $this->fullordertt->find_all("shop = '".$value['shop']."' and email = '".$value['email']."' and ".$xztime." < '$timetj'",'orderinfo,state,product,name,email,dtime,shouldmoney','dtime desc');
|
|
|
+ $k = $this->fullordertt->find_all("shop = '".$value['shop']."' and email = '".$value['email']."' and ".$xztime." < '$timetj'",'number,state,product,name,email,dtime,shouldmoney','dtime desc');
|
|
|
if($excel == 4 && count($k) > 1)
|
|
|
{
|
|
|
foreach ($k as $v)
|
|
|
{
|
|
|
$typeclass = $this->typeclass->read($v['state']);
|
|
|
- $kh[] = array($v['orderinfo'],$typeclass['spare'],$v['product'],$v['name'],$v['email'],date("Y-m-d H:i:s",$v['dtime']),$v['shouldmoney']);
|
|
|
+ $kh[] = array($v['number'],$typeclass['spare'],$v['product'],$v['name'],$v['email'],date("Y-m-d H:i:s",$v['dtime']),$v['shouldmoney']);
|
|
|
}
|
|
|
}
|
|
|
if($excel == 5 && count($k) < 2)
|
|
|
@@ -5701,7 +5701,7 @@ class Fullordertt extends Start_Controller {
|
|
|
{
|
|
|
$typeclass = $this->typeclass->read($k[0]['state']);
|
|
|
}
|
|
|
- $kh[] = array($k[0]['orderinfo'],$typeclass['spare'],$k[0]['product'],$k[0]['name'],$k[0]['email'],date("Y-m-d H:i:s",$k[0]['dtime']),$k[0]['shouldmoney']);
|
|
|
+ $kh[] = array($k[0]['number'],$typeclass['spare'],$k[0]['product'],$k[0]['name'],$k[0]['email'],date("Y-m-d H:i:s",$k[0]['dtime']),$k[0]['shouldmoney']);
|
|
|
}
|
|
|
if(isset($value['email']) && $usp['excelpass'] == '1')
|
|
|
{
|
