|
|
@@ -1316,12 +1316,12 @@ class Usertwo extends Start_Controller
|
|
|
$t = $usat - ($n * 24 * 60 * 60) + ($i * 24 * 60 * 60);
|
|
|
$time[] = date('m-d', $t);
|
|
|
$ct = strtotime(date('Ymd', $t));
|
|
|
- $ctj = strtotime(date('Ymd', $t + 24 * 3600))-1;
|
|
|
+ $ctj = strtotime(date('Ymd', $t + 24 * 3600));
|
|
|
//var_dump(date("Y-m-d H:i:s",$ct)."=================".date("Y-m-d H:i:s",$ctj));
|
|
|
- $dlz = $this->fullorder->find_all("dtime >= " . $ct . " and dtime <= " . $ctj . $where . " and shop != '0' and (" . rtrim($fgshop, 'or') . ") and shop != '18' and shop != '19'", 'budget,shouldmoney,shop,number,refundy,budget,email,refundy');
|
|
|
- $smt = $this->fullordersmt->find_all("dtime >= " . $ct . " and dtime <= " . $ctj . $where . " and shop != '0' and (" . rtrim($fgshop, 'or') . ") and shop != '18' and shop != '19'", 'budget,shouldmoney,shop,refundy,userid,budget,refundy');
|
|
|
- $tt = $this->fullordertt->find_all("state != 217 and dtime >= " . $ct . " and dtime <= " . $ctj . $where . " and shop != '0' and (" . rtrim($fgshop, 'or') . ") and shop != '18' and shop != '19'", 'budget,shouldmoney,shop,number,refundy,budget,email,refundy');
|
|
|
- $amz = $this->fullorderamz->find_all("state != 217 and dtime >= " . $ct . " and dtime <= " . $ctj . $where . " and shop != '0' and (" . rtrim($fgshop, 'or') . ") and shop != '18' and shop != '19'", 'budget,shouldmoney,shop,number,refundy,budget,email,refundy');
|
|
|
+ $dlz = $this->fullorder->find_all("dtime >= " . $ct . " and dtime < " . $ctj . $where . " and shop != '0' and (" . rtrim($fgshop, 'or') . ") and shop != '18' and shop != '19'", 'budget,shouldmoney,shop,number,refundy,budget,email,refundy');
|
|
|
+ $smt = $this->fullordersmt->find_all("dtime >= " . $ct . " and dtime < " . $ctj . $where . " and shop != '0' and (" . rtrim($fgshop, 'or') . ") and shop != '18' and shop != '19'", 'budget,shouldmoney,shop,refundy,userid,budget,refundy');
|
|
|
+ $tt = $this->fullordertt->find_all("state != 217 and dtime >= " . $ct . " and dtime < " . $ctj . $where . " and shop != '0' and (" . rtrim($fgshop, 'or') . ") and shop != '18' and shop != '19'", 'budget,shouldmoney,shop,number,refundy,budget,email,refundy');
|
|
|
+ $amz = $this->fullorderamz->find_all("state != 217 and dtime >= " . $ct . " and dtime < " . $ctj . $where . " and shop != '0' and (" . rtrim($fgshop, 'or') . ") and shop != '18' and shop != '19'", 'budget,shouldmoney,shop,number,refundy,budget,email,refundy');
|
|
|
|
|
|
$ab[] = $dlz;
|
|
|
//数量及金额开始
|
|
|
@@ -1393,12 +1393,12 @@ class Usertwo extends Start_Controller
|
|
|
$t = $usat - ($n * 24 * 60 * 60) + ($i * 24 * 60 * 60);
|
|
|
$timeold[] = date('m-d', $t);
|
|
|
$ct = strtotime(date('Ymd', $t));
|
|
|
- $ctj = strtotime(date('Ymd', $t + 24 * 3600)) - 1;
|
|
|
+ $ctj = strtotime(date('Ymd', $t + 24 * 3600)) ;
|
|
|
//var_dump(date("Y-m-d H:i:s",$ct)."------------------------".date("Y-m-d H:i:s",$ctj));
|
|
|
- $dlz = $this->fullorder->find_all("(" . rtrim($fgshop, 'or') . ") and dtime >= " . $ct . " and dtime <= " . $ctj . $where, 'budget,shouldmoney,shop');
|
|
|
- $smt = $this->fullordersmt->find_all("(" . rtrim($fgshop, 'or') . ") and dtime >= " . $ct . " and dtime <= " . $ctj . $where, 'budget,shouldmoney,shop');
|
|
|
- $tt = $this->fullordertt->find_all("state != 217 and (" . rtrim($fgshop, 'or') . ") and dtime >= " . $ct . " and dtime <= " . $ctj . $where, 'budget,shouldmoney,shop');
|
|
|
- $amz = $this->fullorderamz->find_all("state != 217 and (" . rtrim($fgshop, 'or') . ") and dtime >= " . $ct . " and dtime <= " . $ctj . $where, 'budget,shouldmoney,shop');
|
|
|
+ $dlz = $this->fullorder->find_all("(" . rtrim($fgshop, 'or') . ") and dtime >= " . $ct . " and dtime < " . $ctj . $where, 'budget,shouldmoney,shop');
|
|
|
+ $smt = $this->fullordersmt->find_all("(" . rtrim($fgshop, 'or') . ") and dtime >= " . $ct . " and dtime < " . $ctj . $where, 'budget,shouldmoney,shop');
|
|
|
+ $tt = $this->fullordertt->find_all("state != 217 and (" . rtrim($fgshop, 'or') . ") and dtime >= " . $ct . " and dtime < " . $ctj . $where, 'budget,shouldmoney,shop');
|
|
|
+ $amz = $this->fullorderamz->find_all("state != 217 and (" . rtrim($fgshop, 'or') . ") and dtime >= " . $ct . " and dtime < " . $ctj . $where, 'budget,shouldmoney,shop');
|
|
|
//数量及金额开始
|
|
|
$dlzm = sprintf("%01.2f", array_sum(array_column($dlz, 'shouldmoney')));
|
|
|
$smtm = sprintf("%01.2f", array_sum(array_column($smt, 'shouldmoney')));
|
|
|
@@ -1522,11 +1522,11 @@ class Usertwo extends Start_Controller
|
|
|
$time[] = date('m-d', $t);
|
|
|
$ct = strtotime(date('Ymd', $t));
|
|
|
// [修复 3] $ctj 减 1 秒
|
|
|
- $ctj = strtotime(date('Ymd', $t + 24 * 3600)) - 1;
|
|
|
- $dlz = $this->fullorder->find_all("dtime >= " . $ct . " and dtime <= " . $ctj . $where . " and shop != '0' and (" . rtrim($fgshop, 'or') . ") and shop != '18' and shop != '19'", 'budget,shouldmoney,shop,number,refundy,budget,email,refundy');
|
|
|
- $smt = $this->fullordersmt->find_all("dtime >= " . $ct . " and dtime <= " . $ctj . $where . " and shop != '0' and (" . rtrim($fgshop, 'or') . ") and shop != '18' and shop != '19'", 'budget,shouldmoney,shop,refundy,userid,budget,refundy');
|
|
|
- $tt = $this->fullordertt->find_all("state != 217 and dtime >= " . $ct . " and dtime <= " . $ctj . $where . " and shop != '0' and (" . rtrim($fgshop, 'or') . ") and shop != '18' and shop != '19'", 'budget,shouldmoney,shop,number,refundy,budget,email,refundy');
|
|
|
- $amz = $this->fullorderamz->find_all("state != 217 and dtime >= " . $ct . " and dtime <= " . $ctj . $where . " and shop != '0' and (" . rtrim($fgshop, 'or') . ") and shop != '18' and shop != '19'", 'budget,shouldmoney,shop,number,refundy,budget,email,refundy');
|
|
|
+ $ctj = strtotime(date('Ymd', $t + 24 * 3600)) ;
|
|
|
+ $dlz = $this->fullorder->find_all("dtime >= " . $ct . " and dtime < " . $ctj . $where . " and shop != '0' and (" . rtrim($fgshop, 'or') . ") and shop != '18' and shop != '19'", 'budget,shouldmoney,shop,number,refundy,budget,email,refundy');
|
|
|
+ $smt = $this->fullordersmt->find_all("dtime >= " . $ct . " and dtime < " . $ctj . $where . " and shop != '0' and (" . rtrim($fgshop, 'or') . ") and shop != '18' and shop != '19'", 'budget,shouldmoney,shop,refundy,userid,budget,refundy');
|
|
|
+ $tt = $this->fullordertt->find_all("state != 217 and dtime >= " . $ct . " and dtime < " . $ctj . $where . " and shop != '0' and (" . rtrim($fgshop, 'or') . ") and shop != '18' and shop != '19'", 'budget,shouldmoney,shop,number,refundy,budget,email,refundy');
|
|
|
+ $amz = $this->fullorderamz->find_all("state != 217 and dtime >= " . $ct . " and dtime < " . $ctj . $where . " and shop != '0' and (" . rtrim($fgshop, 'or') . ") and shop != '18' and shop != '19'", 'budget,shouldmoney,shop,number,refundy,budget,email,refundy');
|
|
|
|
|
|
$ab[] = $dlz;
|
|
|
//数量及金额开始
|
|
|
@@ -1601,11 +1601,11 @@ class Usertwo extends Start_Controller
|
|
|
$timeold[] = date('m-d', $t);
|
|
|
$ct = strtotime(date('Ymd', $t));
|
|
|
// [修复 3] $ctj 减 1 秒
|
|
|
- $ctj = strtotime(date('Ymd', $t + 24 * 3600)) - 1;
|
|
|
- $dlz = $this->fullorder->find_all("(" . rtrim($fgshop, 'or') . ") and dtime >= " . $ct . " and dtime <= " . $ctj . $where, 'budget,shouldmoney,shop');
|
|
|
- $smt = $this->fullordersmt->find_all("(" . rtrim($fgshop, 'or') . ") and dtime >= " . $ct . " and dtime <= " . $ctj . $where, 'budget,shouldmoney,shop');
|
|
|
- $tt = $this->fullordertt->find_all("state != 217 and (" . rtrim($fgshop, 'or') . ") and dtime >= " . $ct . " and dtime <= " . $ctj . $where, 'budget,shouldmoney,shop');
|
|
|
- $amz = $this->fullorderamz->find_all("state != 217 and (" . rtrim($fgshop, 'or') . ") and dtime >= " . $ct . " and dtime <= " . $ctj . $where, 'budget,shouldmoney,shop');
|
|
|
+ $ctj = strtotime(date('Ymd', $t + 24 * 3600)) ;
|
|
|
+ $dlz = $this->fullorder->find_all("(" . rtrim($fgshop, 'or') . ") and dtime >= " . $ct . " and dtime < " . $ctj . $where, 'budget,shouldmoney,shop');
|
|
|
+ $smt = $this->fullordersmt->find_all("(" . rtrim($fgshop, 'or') . ") and dtime >= " . $ct . " and dtime < " . $ctj . $where, 'budget,shouldmoney,shop');
|
|
|
+ $tt = $this->fullordertt->find_all("state != 217 and (" . rtrim($fgshop, 'or') . ") and dtime >= " . $ct . " and dtime < " . $ctj . $where, 'budget,shouldmoney,shop');
|
|
|
+ $amz = $this->fullorderamz->find_all("state != 217 and (" . rtrim($fgshop, 'or') . ") and dtime >= " . $ct . " and dtime < " . $ctj . $where, 'budget,shouldmoney,shop');
|
|
|
//数量及金额开始
|
|
|
$dlzm = sprintf("%01.2f", array_sum(array_column($dlz, 'shouldmoney')));
|
|
|
$smtm = sprintf("%01.2f", array_sum(array_column($smt, 'shouldmoney')));
|
