modify TIMESTAMP to time()

admin/control/admin_log.php

@@ -55,7 +55,7 @@ class admin_logControl extends SystemControl{
 	public function list_delOp(){
 		$condition = array();
 		if (is_numeric($_GET['delago'])){
-			$condition['createtime'] = array('lt',TIMESTAMP-intval($_GET['delago']));
+			$condition['createtime'] = array('lt',time()-intval($_GET['delago']));
 		}elseif($_GET['delago'] == 'all'){
 			$condition = true;
 		}elseif(is_array($_POST['del_id'])){

admin/control/control.php

@@ -270,7 +270,7 @@ class SystemControl
 		}
 		$data['content'] 	= $lang.$state;
 		$data['admin_name'] = $admin_name;
-		$data['createtime'] = TIMESTAMP;
+		$data['createtime'] = time();
 		$data['admin_id'] 	= $admin_id;
 		$data['ip']			= getIp();
 		$data['url']		= $_REQUEST['act'].'&'.$_REQUEST['op'];

admin/control/dashboard.php

@@ -88,9 +88,9 @@ class dashboardControl extends SystemControl{
         //店铺续签申请
         $statistics['store_reopen_applay'] = Model('store_reopen')->getStoreReopenCount(array('re_state'=>1));
         // 即将到期
-        $statistics['store_expire'] = $model_store->getStoreCount(array('store_state'=>1, 'store_end_time'=>array('between', array(TIMESTAMP, TIMESTAMP + 864000))));
+        $statistics['store_expire'] = $model_store->getStoreCount(array('store_state'=>1, 'store_end_time'=>array('between', array(time(), time() + 864000))));
         // 已经到期
-        $statistics['store_expired'] = $model_store->getStoreCount(array('store_state'=>1, 'store_end_time'=>array('between', array(1, TIMESTAMP))));
+        $statistics['store_expired'] = $model_store->getStoreCount(array('store_state'=>1, 'store_end_time'=>array('between', array(1, time()))));
 
         /**
          * 商品

admin/control/login.php

@@ -46,7 +46,7 @@ class LoginControl extends SystemControl {
 					$update_info	= array(
 					'admin_id'=>$admin_info['admin_id'],
 					'admin_login_num'=>($admin_info['admin_login_num']+1),
-					'admin_login_time'=>TIMESTAMP
+					'admin_login_time'=>time()
 					);
 					$model_admin->updateAdmin($update_info);
 					$this->log(L('nc_login'),1);

admin/control/mall_consult.php

@@ -58,7 +58,7 @@ class mall_consultControl extends SystemControl{
             }
             $update['is_reply'] = 1;
             $update['mc_reply'] = $reply_content;
-            $update['mc_reply_time'] = TIMESTAMP;
+            $update['mc_reply_time'] = time();
             $update['admin_id'] = $this->admin_info['id'];
             $update['admin_name'] = $this->admin_info['name'];
             $result = $model_mallconsult->editMallConsult(array('mc_id' => $mc_id), $update);

admin/control/predeposit.php

@@ -277,7 +277,7 @@ class predepositControl extends SystemControl{
         $admininfo = $this->getAdminInfo();
         $update['pdc_payment_state'] = 1;
         $update['pdc_payment_admin'] = $admininfo['name'];
-        $update['pdc_payment_time'] = TIMESTAMP;
+        $update['pdc_payment_time'] = time();
         $log_msg = L('admin_predeposit_cash_edit_state').','.L('admin_predeposit_cs_sn').':'.$info['pdc_sn'];
 
         try {

admin/control/store.php

@@ -42,11 +42,11 @@ class storeControl extends SystemControl{
                 $condition['store_state'] = 1;
                 break;
             case 'expired':
-                $condition['store_end_time'] = array('between', array(1, TIMESTAMP));
+                $condition['store_end_time'] = array('between', array(1, time()));
                 $condition['store_state'] = 1;
                 break;
             case 'expire':
-                $condition['store_end_time'] = array('between', array(TIMESTAMP, TIMESTAMP + 864000));
+                $condition['store_end_time'] = array('between', array(time(), time() + 864000));
                 $condition['store_state'] = 1;
                 break;
         }
@@ -756,7 +756,7 @@ class storeControl extends SystemControl{
     public function remind_renewalOp() {
         $store_id = intval($_GET['store_id']);
         $store_info = Model('store')->getStoreInfoByID($store_id);
-        if (!empty($store_info) && $store_info['store_end_time'] < (TIMESTAMP + 864000) && cookie('remindRenewal'.$store_id) == null) {
+        if (!empty($store_info) && $store_info['store_end_time'] < (time() + 864000) && cookie('remindRenewal'.$store_id) == null) {
             // 发送商家消息
             $param = array();
             $param['code'] = 'store_expire';

admin/templates/default/bill.pay.php

@@ -50,7 +50,7 @@
 <link rel="stylesheet" type="text/css" href="<?php echo RESOURCE_SITE_URL;?>/js/jquery-ui/themes/ui-lightness/jquery.ui.css"  />
 <script type="text/javascript">
 $(function(){
-    $('#pay_date').datepicker({dateFormat:'yy-mm-dd',maxDate: '<?php echo date('Y-m-d',TIMESTAMP);?>'});
+    $('#pay_date').datepicker({dateFormat:'yy-mm-dd',maxDate: '<?php echo date('Y-m-d',time());?>'});
     $('#ncsubmit').click(function(){
     	if ($('#pay_date').val() == '') return false;
     	if (confirm("操作提醒：\n该操作不可撤销\n提交前请务必确认店铺是否已收到付款\n继续操作吗?")){

admin/templates/default/bill_order_statis.index.php

@@ -20,7 +20,7 @@
           <td>
 			<select name="query_year" class="querySelect">
 			<option value=""><?php echo $lang['nc_please_choose'];?></option>
-			<?php for($i = date('Y',TIMESTAMP)-5; $i <= date('Y',TIMESTAMP)+2; $i++) { ?>
+			<?php for($i = date('Y',time())-5; $i <= date('Y',time())+2; $i++) { ?>
 			<option value="<?php echo $i;?>" <?php if ($_GET['query_year'] == $i) {?>selected<?php } ?>><?php echo $i;?></option>
 			<?php } ?>
 			</select>

admin/templates/default/order.receive_pay.php

@@ -81,7 +81,7 @@
 <link rel="stylesheet" type="text/css" href="<?php echo RESOURCE_SITE_URL;?>/js/jquery-ui/themes/ui-lightness/jquery.ui.css"  />
 <script type="text/javascript">
 $(function(){
-    $('#payment_time').datepicker({dateFormat: 'yy-mm-dd',maxDate: '<?php echo date('Y-m-d',TIMESTAMP);?>'});
+    $('#payment_time').datepicker({dateFormat: 'yy-mm-dd',maxDate: '<?php echo date('Y-m-d',time());?>'});
     $('#ncsubmit').click(function(){
     	if($("#form1").valid()){
         	if (confirm("操作提醒：\n该操作不可撤销\n提交前请务必确认是否已收到付款\n继续操作吗?")){

admin/templates/default/pd.edit.php

@@ -78,7 +78,7 @@
 <link rel="stylesheet" type="text/css" href="<?php echo RESOURCE_SITE_URL;?>/js/jquery-ui/themes/ui-lightness/jquery.ui.css"  />
 <script type="text/javascript">
 $(function(){
-    $('#payment_time').datepicker({dateFormat: 'yy-mm-dd',maxDate: '<?php echo date('Y-m-d',TIMESTAMP);?>'});
+    $('#payment_time').datepicker({dateFormat: 'yy-mm-dd',maxDate: '<?php echo date('Y-m-d',time());?>'});
     $('#ncsubmit').click(function(){
     	if($("#form1").valid()){
         	if (confirm("操作提醒：\n该操作不可撤销\n提交前请务必确认是否已收到付款\n继续操作吗?")){

admin/templates/default/vr_bill.pay.php

@@ -50,7 +50,7 @@
 <link rel="stylesheet" type="text/css" href="<?php echo RESOURCE_SITE_URL;?>/js/jquery-ui/themes/ui-lightness/jquery.ui.css"  />
 <script type="text/javascript">
 $(function(){
-    $('#pay_date').datepicker({dateFormat:'yy-mm-dd',maxDate: '<?php echo date('Y-m-d',TIMESTAMP);?>'});
+    $('#pay_date').datepicker({dateFormat:'yy-mm-dd',maxDate: '<?php echo date('Y-m-d',time());?>'});
     $('#ncsubmit').click(function(){
     	if ($('#pay_date').val() == '') return false;
     	if (confirm("操作提醒：\n该操作不可撤销\n提交前请务必确认店铺是否已收到付款\n继续操作吗?")){

admin/templates/default/vr_bill_order_statis.index.php

@@ -20,7 +20,7 @@
           <td>
 			<select name="query_year" class="querySelect">
 			<option value=""><?php echo $lang['nc_please_choose'];?></option>
-			<?php for($i = date('Y',TIMESTAMP)-5; $i <= date('Y',TIMESTAMP)+2; $i++) { ?>
+			<?php for($i = date('Y',time())-5; $i <= date('Y',time())+2; $i++) { ?>
 			<option value="<?php echo $i;?>" <?php if ($_GET['query_year'] == $i) {?>selected<?php } ?>><?php echo $i;?></option>
 			<?php } ?>
 			</select>

core/framework/libraries/log.php

@@ -74,19 +74,6 @@ class Log
         if($lev == self::ERR) {
             self::msg();
         }
-//        else
-//        {
-//            $level = self::get_level($lev);
-//            $log_file = BASE_DATA_PATH . '/log/' . date('Ymd', TIMESTAMP) . '.log';
-//            $url = $_SERVER['REQUEST_URI'] ? $_SERVER['REQUEST_URI'] : $_SERVER['PHP_SELF'];
-//            $url .= " ( act={$_GET['act']}&op={$_GET['op']} ) ";
-//            $content = "[{$now}] {$url}\r\n{$level}: {$message}\r\n";
-//            file_put_contents($log_file, $content, FILE_APPEND);
-//
-//            if($lev == self::ERR && is_mobile() != true) {
-//                self::$log[] = "[{$now}] {$level}: {$message}\r\n";
-//            }
-//        }
     }
 
     public static function endl($lev = self::ERR)
@@ -94,13 +81,13 @@ class Log
         $content = "\r\n";
 
         if($lev == self::SQL && self::open_sql) {
-            $log_file = BASE_DATA_PATH.'/log/'.date('Ymd',TIMESTAMP).'-sql.log';
+            $log_file = BASE_DATA_PATH.'/log/'.date('Ymd',time()).'-sql.log';
             file_put_contents($log_file,$content, FILE_APPEND);
             return;
         }
 
         if($lev >= self::cur_level) {
-            $log_file = BASE_DATA_PATH . '/log/' . date('Ymd', TIMESTAMP) . '.log';
+            $log_file = BASE_DATA_PATH . '/log/' . date('Ymd', time()) . '.log';
             file_put_contents($log_file, $content, FILE_APPEND);
         }
     }

core/framework/libraries/process.class.php

@@ -178,9 +178,9 @@ class lock {
 	public function set($key, $value, $type='', $ttl = SESSION_EXPIRE){
 		$info = $this->model->where(array('pid'=>$key))->find();
 		if ($info){
-			$this->model->where(array('pid'=>$key))->update(array('pvalue'=>$value,'expiretime'=>TIMESTAMP+$ttl));
+			$this->model->where(array('pid'=>$key))->update(array('pvalue'=>$value,'expiretime'=>time()+$ttl));
 		}else{
-			$this->model->insert(array('pid'=>$key,'pvalue'=>$value,'expiretime'=>TIMESTAMP+$ttl));
+			$this->model->insert(array('pid'=>$key,'pvalue'=>$value,'expiretime'=>time()+$ttl));
 		}
 	}
 
@@ -193,7 +193,7 @@ class lock {
 	 */
 	public function get($key, $type=''){
 		$info = $this->model->where(array('pid'=>$key))->find();
-		if ($info && ($info['expiretime'] < TIMESTAMP)){
+		if ($info && ($info['expiretime'] < time())){
 			$this->rm($key);return null;
 		}else{
 			return $info['pvalue'];

core/framework/libraries/process.php

@@ -175,9 +175,9 @@ class lock {
 	public function set($key, $value, $type='', $ttl = SESSION_EXPIRE){
 		$info = $this->model->where(array('pid'=>$key))->find();
 		if ($info){
-			$this->model->where(array('pid'=>$key))->update(array('pvalue'=>$value,'expiretime'=>TIMESTAMP+$ttl));
+			$this->model->where(array('pid'=>$key))->update(array('pvalue'=>$value,'expiretime'=>time()+$ttl));
 		}else{
-			$this->model->insert(array('pid'=>$key,'pvalue'=>$value,'expiretime'=>TIMESTAMP+$ttl));
+			$this->model->insert(array('pid'=>$key,'pvalue'=>$value,'expiretime'=>time()+$ttl));
 		}
 	}
 
@@ -190,7 +190,7 @@ class lock {
 	 */
 	public function get($key, $type=''){
 		$info = $this->model->where(array('pid'=>$key))->find();
-		if ($info && ($info['expiretime'] < TIMESTAMP)){
+		if ($info && ($info['expiretime'] < time())){
 			$this->rm($key);return null;
 		}else{
 			return $info['pvalue'];

crontab/control/control.php

@@ -13,7 +13,7 @@ defined('InShopNC') or exit('Access Invalid!');
 class BaseCronControl {
 
     public function shutdown(){
-        exit("success at ".date('Y-m-d H:i:s',TIMESTAMP)."\n");
+        exit("success at ".date('Y-m-d H:i:s',time())."\n");
     }
 
     public function __construct(){

crontab/control/date.php

@@ -131,7 +131,7 @@ class dateControl extends BaseCronControl {
         $logic_vr_order = Logic('vr_order');
         $condition = array();
         $condition['order_state'] = ORDER_STATE_NEW;
-        $condition['add_time'] = array('lt',TIMESTAMP - ORDER_AUTO_CANCEL_DAY * self::EXE_TIMES);
+        $condition['add_time'] = array('lt',time() - ORDER_AUTO_CANCEL_DAY * self::EXE_TIMES);
 
         //分批，每批处理100个订单，最多处理5W个订单
         for ($i = 0; $i < 500; $i++){
@@ -160,7 +160,7 @@ class dateControl extends BaseCronControl {
         $logic_order = Logic('vr_order');
         $condition = array();
         $condition['order_state'] = ORDER_STATE_PAY;
-        $condition['vr_indate'] = array('lt',TIMESTAMP);
+        $condition['vr_indate'] = array('lt',time());
         //分批，每批处理100个订单，最多处理5W个订单
         for ($i = 0; $i < 500; $i++){
             if ($_break) {
@@ -283,7 +283,7 @@ class dateControl extends BaseCronControl {
         //24小时之内登录的会员送积分和经验值,每次最多处理5W个会员
         $model_member = Model('member');
         $condition = array();
-        $condition['member_login_time'] = array('gt',TIMESTAMP - self::EXE_TIMES);
+        $condition['member_login_time'] = array('gt',time() - self::EXE_TIMES);
         for($i = 0; $i < 50000; $i=$i+100) {
             $member_list = $model_member->getMemberList($condition, 'member_name,member_id',0,'', "{$i},100");
             if (!empty($member_list)) {
@@ -302,7 +302,7 @@ class dateControl extends BaseCronControl {
        //24小时之内注册的会员送积分,每次最多处理5W个会员
        if (C('points_isuse')) {
            $condition = array();
-           $condition['member_time'] = array('gt',TIMESTAMP - self::EXE_TIMES);
+           $condition['member_time'] = array('gt',time() - self::EXE_TIMES);
            for($i = 0; $i < 50000; $i=$i+100) {
                $member_list = $model_member->getMemberList($condition, 'member_name,member_id',0,'member_id desc', "{$i},100");
                if (!empty($member_list)) {
@@ -318,7 +318,7 @@ class dateControl extends BaseCronControl {
         //24小时之内完成了实物订单送积分和经验值,每次最多处理5W个订单
         $model_order = Model('order');
         $condition = array();
-        $condition['finnshed_time'] = array('gt',TIMESTAMP - self::EXE_TIMES);
+        $condition['finnshed_time'] = array('gt',time() - self::EXE_TIMES);
         for($i = 0; $i < 50000; $i=$i+100) {
             $order_list = $model_order->getOrderList($condition,'','buyer_name,buyer_id,order_amount,order_sn,order_id','', "{$i},100");
             if (!empty($order_list)) {
@@ -336,7 +336,7 @@ class dateControl extends BaseCronControl {
         //24小时之内完成了实物订单送积分和经验值,每次最多处理5W个订单
         $model_order = Model('vr_order');
         $condition = array();
-        $condition['finnshed_time'] = array('gt',TIMESTAMP - self::EXE_TIMES);
+        $condition['finnshed_time'] = array('gt',time() - self::EXE_TIMES);
         for($i = 0; $i < 50000; $i=$i+100) {
             $order_list = $model_order->getOrderList($condition,'','buyer_name,buyer_id,order_amount,order_sn,order_id','', "{$i},100");
             if (!empty($order_list)) {
@@ -408,7 +408,7 @@ class dateControl extends BaseCronControl {
         $condition = array();
         $condition['order_state'] = ORDER_STATE_SUCCESS;
         $condition['evaluation_state'] = 0;
-        $condition['finnshed_time'] = array('lt',TIMESTAMP - self::ORDER_EVALUATE_TIME);
+        $condition['finnshed_time'] = array('lt',time() - self::ORDER_EVALUATE_TIME);
         $update = array();
         $update['evaluation_state'] = 2;
         $update = $model_order->editOrder($update,$condition,1000);
@@ -422,7 +422,7 @@ class dateControl extends BaseCronControl {
         $condition['order_state'] = ORDER_STATE_SUCCESS;
         $condition['evaluation_state'] = 0;
         $condition['use_state'] = 1;
-        $condition['finnshed_time'] = array('lt',TIMESTAMP - self::ORDER_EVALUATE_TIME);
+        $condition['finnshed_time'] = array('lt',time() - self::ORDER_EVALUATE_TIME);
         $update = array();
         $update['evaluation_state'] = 2;
         $update = $model_order->editOrder($update,$condition,1000);

crontab/control/hour.php

@@ -96,7 +96,7 @@ class hourControl extends BaseCronControl
     
             $model_goods = Model('goods');
             $condition = array();
-            $condition['goods_edittime'] = array('egt',TIMESTAMP-$step_time);
+            $condition['goods_edittime'] = array('egt',time()-$step_time);
             $count = $model_goods->getGoodsOnlineCount($condition,"distinct CONCAT(goods_commonid,',',color_id)");
             $fields = "*,CONCAT(goods_commonid,',',color_id) as nc_distinct";
             for ($i = 0; $i <= $count; $i = $i + $step_num){

crontab/control/minutes.php

@@ -57,7 +57,7 @@ class minutesControl extends BaseCronControl {
 
         //查找待执行任务
         $model_cron = Model('cron');
-        $cron = $model_cron->getCronList(array('exetime'=>array('elt',TIMESTAMP)));
+        $cron = $model_cron->getCronList(array('exetime'=>array('elt',time())));
         if (!is_array($cron)) return ;
         $cron_array = array(); $cronid = array();
         foreach ($cron as $v) {
@@ -168,8 +168,8 @@ class minutesControl extends BaseCronControl {
     private function _cron_5($cron = array()) {
         $condition = array();
         $condition['goods_commonid'] = array('in', array_keys($cron));
-        $condition['start_time'] = array('lt', TIMESTAMP);
-        $condition['end_time'] = array('gt', TIMESTAMP);
+        $condition['start_time'] = array('lt', time());
+        $condition['end_time'] = array('gt', time());
         $groupbuy = Model('groupbuy')->getGroupbuyList($condition);
         foreach ($groupbuy as $val) {
             Model('goods')->editGoods(array('goods_promotion_price' => $val['groupbuy_price'], 'goods_promotion_type' => 1), array('goods_commonid' => $val['goods_commonid']));

crontab/control/month.php

@@ -55,14 +55,14 @@ class monthControl extends BaseCronControl {
         //计算起始时间点，自动生成以月份为单位的空结算记录
         if (!$order_statis_max_info){
             $order_min_info = $model_order->getOrderInfo(array(),array(),'min(add_time) as add_time');
-            $start_unixtime = is_numeric($order_min_info['add_time']) ? $order_min_info['add_time'] : TIMESTAMP;
+            $start_unixtime = is_numeric($order_min_info['add_time']) ? $order_min_info['add_time'] : time();
         } else {
             $start_unixtime = $order_statis_max_info['os_end_date'];
         }
         $data = array();
         $i = 1;
         $start_unixtime = strtotime(date('Y-m-01 00:00:00', $start_unixtime));
-        $current_time = strtotime(date('Y-m-01 00:00:01',TIMESTAMP));
+        $current_time = strtotime(date('Y-m-01 00:00:01',time()));
         while (($time = strtotime('-'.$i.' month',$current_time)) >= $start_unixtime) {
             if (date('Ym',$start_unixtime) == date('Ym',$time)) {
                 //如果两个月份相等检查库是里否存在
@@ -250,7 +250,7 @@ class monthControl extends BaseCronControl {
         $update['ob_result_totals'] = $update['ob_order_totals'] - $update['ob_order_return_totals'] -
         $update['ob_commis_totals'] + $update['ob_commis_return_totals']-
         $update['ob_store_cost_totals'];
-        $update['ob_create_date'] = TIMESTAMP;
+        $update['ob_create_date'] = time();
         $update['ob_state'] = 1;
         return $model_bill->editOrderBill($update,array('ob_no'=>$data_bill['ob_no']));
     }
@@ -265,14 +265,14 @@ class monthControl extends BaseCronControl {
         //计算起始时间点，自动生成以月份为单位的空结算记录
         if (!$order_statis_max_info){
             $order_min_info = $model_order->getOrderInfo(array(),'min(add_time) as add_time');
-            $start_unixtime = is_numeric($order_min_info['add_time']) ? $order_min_info['add_time'] : TIMESTAMP;
+            $start_unixtime = is_numeric($order_min_info['add_time']) ? $order_min_info['add_time'] : time();
         } else {
             $start_unixtime = $order_statis_max_info['os_end_date'];
         }
         $data = array();
         $i = 1;
         $start_unixtime = strtotime(date('Y-m-01 00:00:00', $start_unixtime));
-        $current_time = strtotime(date('Y-m-01 00:00:01',TIMESTAMP));
+        $current_time = strtotime(date('Y-m-01 00:00:01',time()));
         while (($time = strtotime('-'.$i.' month',$current_time)) >= $start_unixtime) {
             if (date('Ym',$start_unixtime) == date('Ym',$time)) {
                 //如果两个月份相等检查库是里否存在
@@ -415,7 +415,7 @@ class monthControl extends BaseCronControl {
 
         //本期应结
         $update['ob_result_totals'] = $update['ob_order_totals'] - $update['ob_commis_totals'];
-        $update['ob_create_date'] = TIMESTAMP;
+        $update['ob_create_date'] = time();
         $update['ob_state'] = 1;
         return $model_bill->editOrderBill($update,array('ob_no'=>$data_bill['ob_no']));
     }

crontab/crawl/upload_control.php

@@ -91,7 +91,7 @@ class upload_control
         $insert_array['apic_cover'] = $img_path;
         $insert_array['apic_size'] = intval($_FILES[upload_control::POST_NAME]['size']);
         $insert_array['apic_spec'] = $width . 'x' . $height;
-        $insert_array['upload_time'] = TIMESTAMP;
+        $insert_array['upload_time'] = time();
         $insert_array['store_id'] = $this->store;
         $model_album->addPic($insert_array);
 

data/crontab/include/arrival_notice.php

@@ -76,6 +76,6 @@ class arrival_noticeControl {
      *
      */
     public function shutdown(){
-        exit("success at ".date('Y-m-d H:i:s',TIMESTAMP)."\n");
+        exit("success at ".date('Y-m-d H:i:s',time())."\n");
     }
 }

data/crontab/include/goods.php

@@ -37,7 +37,7 @@ class goodsControl {
 
         //查找待执行任务
         $model_cron = Model('cron');
-        $cron = $model_cron->getCronList(array('exetime'=>array('elt',TIMESTAMP)));
+        $cron = $model_cron->getCronList(array('exetime'=>array('elt',time())));
         if (!is_array($cron)) return ;
         $cron_array = array(); $cronid = array();
         foreach ($cron as $v) {
@@ -149,8 +149,8 @@ class goodsControl {
     private function _cron_5($cron = array()) {
         $condition = array();
         $condition['goods_commonid'] = array('in', array_keys($cron));
-        $condition['start_time'] = array('lt', TIMESTAMP);
-        $condition['end_time'] = array('gt', TIMESTAMP);
+        $condition['start_time'] = array('lt', time());
+        $condition['end_time'] = array('gt', time());
         $groupbuy = Model('groupbuy')->getGroupbuyList($condition);
         foreach ($groupbuy as $val) {
             Model('goods')->editGoods(array('goods_promotion_price' => $val['groupbuy_price'], 'goods_promotion_type' => 1), array('goods_commonid' => $val['goods_commonid']));
@@ -265,6 +265,6 @@ class goodsControl {
      *
      */
     public function shutdown(){
-        exit("success at ".date('Y-m-d H:i:s',TIMESTAMP)."\n");
+        exit("success at ".date('Y-m-d H:i:s',time())."\n");
     }
 }

data/crontab/include/live_order.php

@@ -55,6 +55,6 @@ class  live_orderControl {
      *
      */
     public function shutdown(){
-        exit("success at ".date('Y-m-d H:i:s',TIMESTAMP)."\n");
+        exit("success at ".date('Y-m-d H:i:s',time())."\n");
     }
 }

data/crontab/include/mail.php

@@ -44,6 +44,6 @@ class mailControl {
      *
      */
     public function shutdown(){
-        exit("success at ".date('Y-m-d H:i:s',TIMESTAMP)."\n");
+        exit("success at ".date('Y-m-d H:i:s',time())."\n");
     }
 }

data/crontab/include/order.php

@@ -35,14 +35,14 @@ class orderControl {
         //计算起始时间点，自动生成以月份为单位的空结算记录
         if (!$order_statis_max_info){
             $order_min_info = $model_order->getOrderInfo(array(),array(),'min(add_time) as add_time');
-            $start_unixtime = is_numeric($order_min_info['add_time']) ? $order_min_info['add_time'] : TIMESTAMP;
+            $start_unixtime = is_numeric($order_min_info['add_time']) ? $order_min_info['add_time'] : time();
         } else {
             $start_unixtime = $order_statis_max_info['os_end_date'];
         }
         $data = array();
         $i = 1;
         $start_unixtime = strtotime(date('Y-m-01 00:00:00', $start_unixtime));
-        $current_time = strtotime(date('Y-m-01 00:00:01',TIMESTAMP));
+        $current_time = strtotime(date('Y-m-01 00:00:01',time()));
         while (($time = strtotime('-'.$i.' month',$current_time)) >= $start_unixtime) {
             if (date('Ym',$start_unixtime) == date('Ym',$time)) {
                 //如果两个月份相等检查库是里否存在
@@ -227,7 +227,7 @@ class orderControl {
         $update['ob_result_totals'] = $update['ob_order_totals'] - $update['ob_order_return_totals'] -
         $update['ob_commis_totals'] + $update['ob_commis_return_totals']-
         $update['ob_store_cost_totals'];
-        $update['ob_create_date'] = TIMESTAMP;
+        $update['ob_create_date'] = time();
         $update['ob_state'] = 1;
         $result = $model_bill->editOrderBill($update,array('ob_no'=>$data_bill['ob_no']));
         return $result;
@@ -238,6 +238,6 @@ class orderControl {
      *
      */
     public function shutdown(){
-        exit("success at ".date('Y-m-d H:i:s',TIMESTAMP)."\n");
+        exit("success at ".date('Y-m-d H:i:s',time())."\n");
     }
 }

data/crontab/include/stat.php

@@ -419,6 +419,6 @@ class statControl {
      *
      */
     public function shutdown(){
-        exit("success at ".date('Y-m-d H:i:s',TIMESTAMP)."\n");
+        exit("success at ".date('Y-m-d H:i:s',time())."\n");
     }
 }

data/crontab/include/xs.php

@@ -55,7 +55,7 @@ class xsControl {
 
         $model_goods = Model('goods');
         $condition = array();
-        $condition['goods_edittime'] = array('egt',TIMESTAMP-$step_time);
+        $condition['goods_edittime'] = array('egt',time()-$step_time);
         $count = $model_goods->getGoodsOnlineCount($condition,"distinct CONCAT(goods_commonid,',',color_id)");
         $fields = "*,CONCAT(goods_commonid,',',color_id) as nc_distinct";
         for ($i = 0; $i <= $count; $i = $i + $step_num){
@@ -155,6 +155,6 @@ class xsControl {
      *
      */
     public function shutdown(){
-        exit("success at ".date('Y-m-d H:i:s',TIMESTAMP)."\n");
+        exit("success at ".date('Y-m-d H:i:s',time())."\n");
     }
 }

data/logic/payment.logic.php

@@ -368,7 +368,7 @@ class paymentLogic
         $condition['pdr_payment_state'] = 0;
         $update = array();
         $update['pdr_payment_state'] = 1;
-        $update['pdr_payment_time'] = TIMESTAMP;
+        $update['pdr_payment_time'] = time();
         $update['pdr_payment_code'] = $payment_info['payment_code'];
         $update['pdr_payment_name'] = $payment_info['payment_name'];
         $update['pdr_trade_sn'] = $trade_no;

data/logic/vr_order.logic.php

@@ -57,7 +57,7 @@ class vr_orderLogic {
             $update_order = array(
                     'order_state' => ORDER_STATE_CANCEL,
                     'pd_amount' => 0,
-                    'close_time' => TIMESTAMP,
+                    'close_time' => time(),
                     'close_reason' => $msg
             );
             $update = $model_vr_order->editOrder($update_order,array('order_id'=>$order_info['order_id']));
@@ -113,7 +113,7 @@ class vr_orderLogic {
             //更新订单状态
             $update_order = array();
             $update_order['order_state'] = ORDER_STATE_PAY;
-            $update_order['payment_time'] = $post['payment_time'] ? strtotime($post['payment_time']) : TIMESTAMP;
+            $update_order['payment_time'] = $post['payment_time'] ? strtotime($post['payment_time']) : time();
             $update_order['payment_code'] = $post['payment_code'];
             $update_order['trade_no'] = $post['trade_no'];
             $update = $model_vr_order->editOrder($update_order,array('order_id'=>$order_info['order_id']));
@@ -166,10 +166,10 @@ class vr_orderLogic {
         $condition['vr_state'] = 0;
         $condition['refund_lock'] = array('in',array(0,1));
         $condition['order_id'] = $order_id;
-        $condition['vr_indate'] = array('gt',TIMESTAMP);
+        $condition['vr_indate'] = array('gt',time());
         $order_code_info = $model_vr_order->getOrderCodeInfo($condition,'*',true);
         if (empty($order_code_info)) {
-            $update = $model_vr_order->editOrder(array('order_state' => ORDER_STATE_SUCCESS,'finnshed_time' => TIMESTAMP), array('order_id' => $order_id));
+            $update = $model_vr_order->editOrder(array('order_state' => ORDER_STATE_SUCCESS,'finnshed_time' => time()), array('order_id' => $order_id));
             if (!$update) {
                 callback(false,'更新失败');
             }

data/model/groupbuy.model.php

@@ -88,8 +88,8 @@ class groupbuyModel extends Model
      */
     public function getGroupbuyOnlineList($condition, $page = null, $order = 'state asc', $field = '*') {
         $condition['state'] = self::GROUPBUY_STATE_NORMAL;
-        $condition['start_time'] = array('lt', TIMESTAMP);
-        $condition['end_time'] = array('gt', TIMESTAMP);
+        $condition['start_time'] = array('lt', time());
+        $condition['end_time'] = array('gt', time());
         return $this->getGroupbuyExtendList($condition, $page, $order, $field);
     }
 
@@ -104,7 +104,7 @@ class groupbuyModel extends Model
      */
     public function getGroupbuySoonList($condition, $page = null, $order = 'state asc', $field = '*') {
         $condition['state'] = self::GROUPBUY_STATE_NORMAL;
-        $condition['start_time'] = array('gt', TIMESTAMP);
+        $condition['start_time'] = array('gt', time());
         return $this->getGroupbuyExtendList($condition, $page, $order, $field);
     }
 
@@ -129,8 +129,8 @@ class groupbuyModel extends Model
     public function getGroupbuyCommendedList($limit = 4) {
         $condition = array();
         $condition['state'] = self::GROUPBUY_STATE_NORMAL;
-        $condition['start_time'] = array('lt', TIMESTAMP);
-        $condition['end_time'] = array('gt', TIMESTAMP);
+        $condition['start_time'] = array('lt', time());
+        $condition['end_time'] = array('gt', time());
         return $this->getGroupbuyExtendList($condition, null, 'recommended desc', '*', $limit);
     }
 
@@ -158,8 +158,8 @@ class groupbuyModel extends Model
      */
     public function getGroupbuyOnlineInfo($condition) {
         $condition['state'] = self::GROUPBUY_STATE_NORMAL;
-        $condition['start_time'] = array('lt', TIMESTAMP);
-        $condition['end_time'] = array('gt', TIMESTAMP);
+        $condition['start_time'] = array('lt', time());
+        $condition['end_time'] = array('gt', time());
         $groupbuy_info = $this->where($condition)->find();
         return $groupbuy_info;
     }
@@ -198,14 +198,14 @@ class groupbuyModel extends Model
         if (empty($info)) {
             $condition = array();
             $condition['state'] = self::GROUPBUY_STATE_NORMAL;
-            $condition['end_time'] = array('gt', TIMESTAMP);
+            $condition['end_time'] = array('gt', time());
             $condition['goods_commonid'] = $goods_commonid;
             $groupbuy_goods_list = $this->getGroupbuyExtendList($condition, null, 'start_time asc', '*', 1);
             $info['info'] = serialize($groupbuy_goods_list[0]);
             $this->_wGoodsGroupbuyCache($goods_commonid, $info);
         }
         $groupbuy_goods_info = unserialize($info['info']);
-        if (!empty($groupbuy_goods_info) && ($groupbuy_goods_info['start_time'] > TIMESTAMP || $groupbuy_goods_info['end_time'] < TIMESTAMP)) {
+        if (!empty($groupbuy_goods_info) && ($groupbuy_goods_info['start_time'] > time() || $groupbuy_goods_info['end_time'] < time())) {
             $groupbuy_goods_info = array();
         }
         return $groupbuy_goods_info;
@@ -232,8 +232,8 @@ class groupbuyModel extends Model
     private function _getGroupbuyListByGoodsCommon($goods_commonid_string) {
         $condition = array();
         $condition['state'] = self::GROUPBUY_STATE_NORMAL;
-        $condition['start_time'] = array('lt', TIMESTAMP);
-        $condition['end_time'] = array('gt', TIMESTAMP);
+        $condition['start_time'] = array('lt', time());
+        $condition['end_time'] = array('gt', time());
         $condition['goods_commonid'] = array('in', $goods_commonid_string);
         $xianshi_goods_list = $this->getGroupbuyExtendList($condition, null, 'groupbuy_id desc', '*');
         return $xianshi_goods_list;
@@ -380,7 +380,7 @@ class groupbuyModel extends Model
      * 过期抢购修改状态，解锁对应商品
      */
     public function editExpireGroupbuy($condition) {
-        $condition['end_time'] = array('lt', TIMESTAMP);
+        $condition['end_time'] = array('lt', time());
         $condition['state'] = array('in', array(self::GROUPBUY_STATE_REVIEW, self::GROUPBUY_STATE_NORMAL));
 
         $expire_groupbuy_list = $this->getGroupbuyExtendList($condition, null);
@@ -464,9 +464,9 @@ class groupbuyModel extends Model
         if(empty($groupbuy_info['groupbuy_image1'])) {
             $groupbuy_info['groupbuy_image1'] = $groupbuy_info['groupbuy_image'];
         }
-        if($groupbuy_info['start_time'] > TIMESTAMP && $groupbuy_info['state'] == self::GROUPBUY_STATE_NORMAL) {
+        if($groupbuy_info['start_time'] > time() && $groupbuy_info['state'] == self::GROUPBUY_STATE_NORMAL) {
             $groupbuy_info['groupbuy_state_text'] = '正常(未开始)';
-        } elseif ($groupbuy_info['end_time'] < TIMESTAMP && $groupbuy_info['state'] == self::GROUPBUY_STATE_NORMAL) {
+        } elseif ($groupbuy_info['end_time'] < time() && $groupbuy_info['state'] == self::GROUPBUY_STATE_NORMAL) {
             $groupbuy_info['groupbuy_state_text'] = '已结束';
         } else {
             $groupbuy_info['groupbuy_state_text'] = $this->groupbuy_state_array[$groupbuy_info['state']];
@@ -496,19 +496,19 @@ class groupbuyModel extends Model
                 $groupbuy_info['button_text'] = '已结束';
                 break;
             case self::GROUPBUY_STATE_NORMAL:
-                if($groupbuy_info['start_time'] > TIMESTAMP) {
+                if($groupbuy_info['start_time'] > time()) {
                     $groupbuy_info['state_flag'] = 'not-start';
                     $groupbuy_info['button_text'] = '未开始';
                     $groupbuy_info['count_down_text'] = '距抢购开始';
-                    $groupbuy_info['count_down'] = $groupbuy_info['start_time'] - TIMESTAMP;
-                } elseif ($groupbuy_info['end_time'] < TIMESTAMP) {
+                    $groupbuy_info['count_down'] = $groupbuy_info['start_time'] - time();
+                } elseif ($groupbuy_info['end_time'] < time()) {
                     $groupbuy_info['state_flag'] = 'close';
                     $groupbuy_info['button_text'] = '已结束';
                 } else {
                     $groupbuy_info['state_flag'] = 'buy-now';
                     $groupbuy_info['button_text'] = '我要抢';
                     $groupbuy_info['count_down_text'] = '距抢购结束';
-                    $groupbuy_info['count_down'] = $groupbuy_info['end_time'] - TIMESTAMP;
+                    $groupbuy_info['count_down'] = $groupbuy_info['end_time'] - time();
                 }
                 break;
         }

data/model/groupbuy_quota.model.php

@@ -47,7 +47,7 @@ class groupbuy_quotaModel extends Model{
     public function getGroupbuyQuotaCurrent($store_id) {
         $condition = array();
         $condition['store_id'] = $store_id;
-        $condition['end_time'] = array('gt', TIMESTAMP);
+        $condition['end_time'] = array('gt', time());
         return $this->getGroupbuyQuotaInfo($condition);
     }
 

data/model/mall_consult.model.php

@@ -69,7 +69,7 @@ class mall_consultModel extends Model{
      * @return int
      */
     public function addMallConsult($insert) {
-        $insert['mc_addtime'] = TIMESTAMP;
+        $insert['mc_addtime'] = time();
         return $this->insert($insert);
     }
     

data/model/p_booth.model.php

@@ -50,7 +50,7 @@ class p_boothModel extends Model {
      */
     public function getBoothQuotaInfoCurrent($store_id) {
         $condition['store_id'] = $store_id;
-        $condition['booth_quota_endtime'] = array('gt', TIMESTAMP);
+        $condition['booth_quota_endtime'] = array('gt', time());
         $condition['booth_state'] = 1;
         return $this->getBoothQuotaInfo($condition);
     }

data/model/p_bundling.model.php

@@ -166,7 +166,7 @@ class p_bundlingModel extends Model {
      */
     public function getBundlingQuotaInfoCurrent($store_id) {
         $condition['store_id'] = $_SESSION['store_id'];
-        $condition['bl_quota_endtime'] = array('gt', TIMESTAMP);
+        $condition['bl_quota_endtime'] = array('gt', time());
         $condition['bl_state'] = 1;
         return $this->getBundlingQuotaInfo($condition);
     }
@@ -256,7 +256,7 @@ class p_bundlingModel extends Model {
      * @return boolean
      */
     public function editBundlingTimeout($condition) {
-        $condition['bl_quota_endtime'] = array('lt', TIMESTAMP);
+        $condition['bl_quota_endtime'] = array('lt', time());
         $quota_list = $this->getBundlingQuotaList($condition);
         if (!empty($quota_list)) {
             $quotaid_array = array();

data/model/p_mansong.model.php

@@ -108,7 +108,7 @@ class p_mansongModel extends Model{
             $condition = array();
             $condition['state'] = self::MANSONG_STATE_NORMAL;
             $condition['store_id'] = $store_id;
-            $condition['end_time'] = array('gt', TIMESTAMP);
+            $condition['end_time'] = array('gt', time());
             $mansong_list = $this->getMansongList($condition, null, 'start_time asc', '*', 1);
     
             $mansong_info = $mansong_list[0];
@@ -127,7 +127,7 @@ class p_mansongModel extends Model{
             $this->_wGoodsMansongCache($store_id, $info);
         }
         $mansong_info = unserialize($info['info']);
-        if (!empty($mansong_info) && $mansong_info['start_time'] > TIMESTAMP) {
+        if (!empty($mansong_info) && $mansong_info['start_time'] > time()) {
             $mansong_info = array();
         }
         if (!empty($mansong_info)) {
@@ -180,13 +180,13 @@ class p_mansongModel extends Model{
      *
      */
     public function getMansongExtendInfo($mansong_info) {
-        if($mansong_info['end_time'] > TIMESTAMP) {
+        if($mansong_info['end_time'] > time()) {
             $mansong_info['mansong_state_text'] = $this->mansong_state_array[$mansong_info['state']];
         } else {
             $mansong_info['mansong_state_text'] = '已结束';
         }
 
-        if($mansong_info['state'] == self::MANSONG_STATE_NORMAL && $mansong_info['end_time'] > TIMESTAMP) {
+        if($mansong_info['state'] == self::MANSONG_STATE_NORMAL && $mansong_info['end_time'] > time()) {
             $mansong_info['editable'] = true;
         } else {
             $mansong_info['editable'] = false;
@@ -279,7 +279,7 @@ class p_mansongModel extends Model{
         $update['state'] = self::MANSONG_STATE_CLOSE;
 
         $condition = array();
-        $condition['end_time'] = array('lt', TIMESTAMP);
+        $condition['end_time'] = array('lt', time());
         $condition['state'] = self::MANSONG_STATE_NORMAL;
         $this->editMansong($update, $condition);
     }

data/model/p_mansong_quota.model.php

@@ -47,7 +47,7 @@ class p_mansong_quotaModel extends Model{
     public function getMansongQuotaCurrent($store_id) {
         $condition = array();
         $condition['store_id'] = $store_id;
-        $condition['end_time'] = array('gt', TIMESTAMP);
+        $condition['end_time'] = array('gt', time());
         return $this->getMansongQuotaInfo($condition);
     }
 

data/model/p_xianshi_quota.model.php

@@ -47,7 +47,7 @@ class p_xianshi_quotaModel extends Model{
     public function getXianshiQuotaCurrent($store_id) {
         $condition = array();
         $condition['store_id'] = $store_id;
-        $condition['end_time'] = array('gt', TIMESTAMP);
+        $condition['end_time'] = array('gt', time());
         return $this->getXianshiQuotaInfo($condition);
     }
 

data/model/predeposit.model.php

@@ -214,7 +214,7 @@ class predepositModel extends Model {
             'member_id' => $data['member_id'],
             'member_name' => $data['member_name'],
             'type' => $type,
-            'add_time' => TIMESTAMP,
+            'add_time' => time(),
             'available_amount' => $available,
             'freeze_amount' => $freeze,
             'description' => $desc,
@@ -229,7 +229,7 @@ class predepositModel extends Model {
             'code' => 'recharge_card_balance_change',
             'member_id' => $data['member_id'],
             'param' => array(
-                'time' => date('Y-m-d H:i:s', TIMESTAMP),
+                'time' => date('Y-m-d H:i:s', time()),
                 'url' => urlShop('predeposit', 'rcb_log_list'),
                 'available_amount' => ncPriceFormat($available),
                 'freeze_amount' => ncPriceFormat($freeze),
@@ -258,7 +258,7 @@ class predepositModel extends Model {
 
         $data_log['lg_member_id'] = $data['member_id'];
         $data_log['lg_member_name'] = $data['member_name'];
-        $data_log['lg_add_time'] = time();//TIMESTAMP;//手机端有bug, 不能用宏
+        $data_log['lg_add_time'] = time();
         $data_log['lg_type'] = $change_type;
 
         $data_msg['time'] = date('Y-m-d H:i:s');

data/model/search.model.php

@@ -238,7 +238,7 @@ class searchModel
         $_diff_ids = array_diff($indexer_ids,$goods_ids);
 
         if (!empty($_diff_ids)) {
-            file_put_contents(BASE_DATA_PATH.'/log/search.log',date('Y-m-d H:i:s',TIMESTAMP)."\r\n",FILE_APPEND);
+            file_put_contents(BASE_DATA_PATH.'/log/search.log',date('Y-m-d H:i:s',time())."\r\n",FILE_APPEND);
             file_put_contents(BASE_DATA_PATH.'/log/search.log',implode(',',$indexer_ids)."\r\n",FILE_APPEND);
             file_put_contents(BASE_DATA_PATH.'/log/search.log',implode(',',$goods_ids)."\r\n",FILE_APPEND);
             file_put_contents(BASE_DATA_PATH.'/log/search.log',implode(',',$_diff_ids)."\r\n\r\n",FILE_APPEND);

data/model/store.model.php

@@ -416,7 +416,7 @@ class storeModel extends Model {
     //获取近期销量
     private function getGoodsCountJq($store_array) {
     	$model = Model();
-    	$order_count_array = $model->table('order')->field('store_id,count(*) as order_count')->where(array('store_id'=>array('in',implode(',',array_keys($store_array))),'add_time'=>array('gt',TIMESTAMP-3600*24*90)))->group('store_id')->select();
+    	$order_count_array = $model->table('order')->field('store_id,count(*) as order_count')->where(array('store_id'=>array('in',implode(',',array_keys($store_array))),'add_time'=>array('gt',time()-3600*24*90)))->group('store_id')->select();
     	foreach ((array)$order_count_array as $value) {
     		$store_array[$value['store_id']]['num_sales_jq'] = $value['order_count'];
     	}

data/model/store_msg_read.model.php

@@ -13,7 +13,7 @@ class store_msg_readModel extends Model{
      * @param unknown $insert
      */
     public function addStoreMsgRead($insert) {
-        $insert['read_time'] = TIMESTAMP;
+        $insert['read_time'] = time();
         return $this->insert($insert);
     }
     

data/model/voucher.model.php

@@ -50,7 +50,7 @@ class voucherModel extends Model {
 	 * @return string
 	 */
 	public function getCurrentAvailableVoucher($condition = array(), $goods_total = 0) {
-	   $condition['voucher_end_date'] = array('gt',TIMESTAMP);
+	   $condition['voucher_end_date'] = array('gt',time());
 	   $condition['voucher_state'] = 1;
 	   $voucher_list = $this->table('voucher')->where($condition)->key('voucher_t_id')->select();
 	   foreach ($voucher_list as $key => $voucher) {
@@ -71,7 +71,7 @@ class voucherModel extends Model {
 	    $info = rcache($member_id, 'm_voucher', 'voucher_count');
 	    if (empty($info['voucher_count']) && $info['voucher_count'] !== 0) {
 	        $condition['voucher_owner_id'] = $member_id;
-	        $condition['voucher_end_date'] = array('gt',TIMESTAMP);
+	        $condition['voucher_end_date'] = array('gt',time());
 	        $condition['voucher_state'] = 1;
 	        $voucher_count = $this->table('voucher')->where($condition)->count();
 	        $voucher_count = intval($voucher_count);
@@ -92,7 +92,7 @@ class voucherModel extends Model {
 		}
         $param = array();
         $param['quota_storeid'] = $store_id;
-        $param['quota_endtime'] = array('gt', TIMESTAMP);
+        $param['quota_endtime'] = array('gt', time());
         $info = $this->table('voucher_quota')->where($param)->find();
         return $info;
 	}
@@ -284,7 +284,7 @@ class voucherModel extends Model {
         $condition = array();
         $condition['voucher_owner_id'] = $member_id;
         $condition['voucher_state'] = self::VOUCHER_STATE_UNUSED;
-        $condition['voucher_end_date'] = array('lt', TIMESTAMP);
+        $condition['voucher_end_date'] = array('lt', time());
 
         $this->table('voucher')->where($condition)->update(array('voucher_state' => self::VOUCHER_STATE_EXPIRE));
     }

data/model/vr_order.model.php

@@ -165,7 +165,7 @@ class vr_orderModel extends Model {
                 if ($v['vr_state'] == '1') {
                     $content = '已使用，使用时间 '.date('Y-m-d',$v['vr_usetime']);
                 } else if ($v['vr_state'] == '0') {
-                    if ($v['vr_indate'] < TIMESTAMP) {
+                    if ($v['vr_indate'] < time()) {
                         $content = '已过期，过期时间 '.date('Y-m-d',$v['vr_indate']);
                     } else {
                         $content = '未使用，有效期至 '.date('Y-m-d',$v['vr_indate']);
@@ -321,10 +321,10 @@ class vr_orderModel extends Model {
         	    $state = false;
         	    $code_list = $order_info['code_list'];//没有使用的兑换码列表
         	    if (!empty($code_list) && is_array($code_list)) {
-        	        if ($order_info['vr_indate'] > TIMESTAMP) {//有效期内的能退款
+        	        if ($order_info['vr_indate'] > time()) {//有效期内的能退款
         	            $state = true;
         	        }
-        	        if ($order_info['vr_invalid_refund'] == 1 && ($order_info['vr_indate'] + 60*60*24*CODE_INVALID_REFUND) > TIMESTAMP) {//兑换码过期后可退款
+        	        if ($order_info['vr_invalid_refund'] == 1 && ($order_info['vr_indate'] + 60*60*24*CODE_INVALID_REFUND) > time()) {//兑换码过期后可退款
         	            $state = true;
         	        }
         	    }

delivery/control/joinin.php

@@ -41,7 +41,7 @@ class joininControl extends BaseAccountCenterControl{
         $insert['dlyp_area_info']   = $_POST['area_info'];
         $insert['dlyp_address']     = $_POST['daddress'];
         $insert['dlyp_idcard']      = $_POST['didcard'];
-        $insert['dlyp_addtime']     = TIMESTAMP;
+        $insert['dlyp_addtime']     = time();
         $insert['dlyp_state']       = 10;
         $upload = new UploadFile();
         $upload->set('default_dir',ATTACH_DELIVERY);

delivery/control/joinin_again.php

@@ -42,7 +42,7 @@ class joinin_againControl extends BaseDeliveryCenterControl{
         $update['dlyp_area_info']   = $_POST['area_info'];
         $update['dlyp_address']     = $_POST['daddress'];
         $update['dlyp_idcard']      = $_POST['didcard'];
-        $update['dlyp_addtime']     = TIMESTAMP;
+        $update['dlyp_addtime']     = time();
         $update['dlyp_state']       = 10;
         $update['dlyp_fail_reason'] = '';
         $upload = new UploadFile();

queue/model/queue.model.php

@@ -89,7 +89,7 @@ class queueModel extends Model{
      * @param array $groupbuy
      */
     public function updateGoodsPromotionPriceByGroupbuyId($groupbuy_id) {
-        $groupbuy_info = Model('groupbuy')->getGroupbuyInfo(array('groupbuy_id' => $groupbuy_id, 'start_time' => array('lt', TIMESTAMP), 'end_time' => array('gt', TIMESTAMP)));
+        $groupbuy_info = Model('groupbuy')->getGroupbuyInfo(array('groupbuy_id' => $groupbuy_id, 'start_time' => array('lt', time()), 'end_time' => array('gt', time())));
         if(!empty($groupbuy_info)) {
             // 没有促销使用原价
             Model('goods')->editGoods(array('goods_promotion_price' => $groupbuy_info['groupbuy_price'], 'goods_promotion_type' => 1), array('goods_commonid' => $groupbuy_info['goods_commonid']));
@@ -101,7 +101,7 @@ class queueModel extends Model{
      * 根据限时折扣id更新促销价格
      */
     public function updateGoodsPromotionPriceByXianshiId($xianshi_id) {
-        $xianshigoods_array = Model('p_xianshi_goods')->getXianshiGoodsList(array('xianshi_id' => $xianshi_id, 'start_time' => array('lt', TIMESTAMP), 'end_time' => array('gt', TIMESTAMP)));
+        $xianshigoods_array = Model('p_xianshi_goods')->getXianshiGoodsList(array('xianshi_id' => $xianshi_id, 'start_time' => array('lt', time()), 'end_time' => array('gt', time())));
         if(!empty($xianshigoods_array)) {
             foreach ($xianshigoods_array as $val) {
                 $goods_info = Model('goods')->getGoodsInfo(array('goods_id' => $val['goods_id']), 'goods_promotion_type');

research/research_run.php

@@ -241,7 +241,6 @@ $user = parase_wxinfo($str);
 //$x=new date();
 //
 //define('StartTime', microtime(true));
-//define('TIMESTAMP', time());
 //
 //if(count($argv) == 1) {
 //