root 9 лет назад
Родитель
Сommit
35b308f225

+ 1 - 1
data/logic/buy.logic.php

@@ -653,7 +653,7 @@ class buyLogic {
             $order['buyer_id'] = $member_id;
             $order['buyer_name'] = $member_name;
             $order['buyer_email'] = $member_email;
-            $order['add_time'] = TIMESTAMP;
+            $order['add_time'] = time();
             $order['payment_code'] = $store_pay_type_list[$store_id];
             $order['order_state'] = $store_pay_type_list[$store_id] == 'online' ? ORDER_STATE_NEW : ORDER_STATE_PAY;
             $order['order_amount'] = $store_final_order_total[$store_id];

+ 2 - 2
data/logic/buy_1.logic.php

@@ -527,7 +527,7 @@ class buy_1Logic {
                 //订单状态 置为已支付
                 $data_order = array();
                 $order_list[$key]['order_state'] = $data_order['order_state'] = ORDER_STATE_PAY;
-                $data_order['payment_time'] = TIMESTAMP;
+                $data_order['payment_time'] = time();
                 $data_order['payment_code'] = 'predeposit';
                 $data_order['rcb_amount'] = $order_amount;
                 $result = $model_order->editOrder($data_order,array('order_id'=>$order_info['order_id']));
@@ -621,7 +621,7 @@ class buy_1Logic {
                 //订单状态 置为已支付
                 $data_order = array();
                 $data_order['order_state'] = ORDER_STATE_PAY;
-                $data_order['payment_time'] = TIMESTAMP;
+                $data_order['payment_time'] = time();
                 $data_order['payment_code'] = 'predeposit';
                 $data_order['pd_amount'] = $order_amount;
                 $result = $model_order->editOrder($data_order,array('order_id'=>$order_info['order_id']));

+ 3 - 3
data/logic/buy_virtual.logic.php

@@ -170,7 +170,7 @@ class buy_virtualLogic {
         $order['buyer_name'] = $member_info['member_name'];
         $order['buyer_phone'] = $input['buyer_phone'];
         $order['buyer_msg'] = $input['buyer_msg'];
-        $order['add_time'] = TIMESTAMP;
+        $order['add_time'] = time();
         $order['order_state'] = ORDER_STATE_NEW;
         $order['order_amount'] = $pay_total;
         $order['goods_id'] = $goods_info['goods_id'];
@@ -258,7 +258,7 @@ class buy_virtualLogic {
             // 订单状态 置为已支付
             $data_order = array();
             $order_info['order_state'] = $data_order['order_state'] = ORDER_STATE_PAY;
-            $data_order['payment_time'] = TIMESTAMP;
+            $data_order['payment_time'] = time();
             $data_order['payment_code'] = 'predeposit';
             $data_order['rcb_amount'] = $order_info['order_amount'];
             $result = $model_vr_order->editOrder($data_order,array('order_id'=>$order_info['order_id']));
@@ -328,7 +328,7 @@ class buy_virtualLogic {
             // 订单状态 置为已支付
             $data_order = array();
             $data_order['order_state'] = ORDER_STATE_PAY;
-            $data_order['payment_time'] = TIMESTAMP;
+            $data_order['payment_time'] = time();
             $data_order['payment_code'] = 'predeposit';
             $data_order['pd_amount'] = $order_amount;
             $result = $model_vr_order->editOrder($data_order,array('order_id'=>$order_info['order_id']));

+ 4 - 4
data/logic/order.logic.php

@@ -105,7 +105,7 @@ class orderLogic {
 
             //更新订单状态
             $update_order = array();
-            $update_order['finnshed_time'] = TIMESTAMP;
+            $update_order['finnshed_time'] = time();
             $update_order['order_state'] = ORDER_STATE_SUCCESS;
             $update = $model_order->editOrder($update_order,array('order_id'=>$order_id));
             if (!$update) {
@@ -249,7 +249,7 @@ class orderLogic {
             $data['deliver_explain'] = $post['deliver_explain'];
             $data['daddress_id'] = intval($post['daddress_id']);
             $data['shipping_express_id'] = intval($post['shipping_express_id']);
-            $data['shipping_time'] = TIMESTAMP;
+            $data['shipping_time'] = time();
 
             $condition = array();
             $condition['order_id'] = $order_id;
@@ -262,7 +262,7 @@ class orderLogic {
             $data = array();
             $data['shipping_code']  = $post['shipping_code'];
             $data['order_state'] = ORDER_STATE_SEND;
-            $data['delay_time'] = TIMESTAMP;
+            $data['delay_time'] = time();
             $update = $model_order->editOrder($data,$condition);
             if (!$update) {
                 throw new Exception('操作失败');
@@ -358,7 +358,7 @@ class 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 = $model_order->editOrder($update_order,array('pay_sn'=>$order_info['pay_sn'],'order_state'=>ORDER_STATE_NEW));
             if (!$update) {

+ 1 - 1
data/model/arrival_notice.model.php

@@ -55,7 +55,7 @@ class arrival_noticeModel extends Model{
      * @return int
      */
     public function addArrivalNotice($insert) {
-        $insert['an_addtime'] = TIMESTAMP;
+        $insert['an_addtime'] = time();
         return $this->insert($insert);
     }
     

+ 2 - 2
data/model/buy.model.php

@@ -431,7 +431,7 @@ class buyModel {
             $order['buyer_id'] = $member_id;
             $order['buyer_name'] = $member_name;
             $order['buyer_email'] = $member_email;
-            $order['add_time'] = TIMESTAMP;
+            $order['add_time'] = time();
             $order['payment_code'] = $store_pay_type_list[$store_id];
             $order['order_state'] = $store_pay_type_list[$store_id] == 'online' ? ORDER_STATE_NEW : ORDER_STATE_PAY;
             $order['order_amount'] = $store_final_order_total[$store_id];
@@ -672,7 +672,7 @@ class buyModel {
                 //订单状态 置为已支付
                 $data_order = array();
                 $data_order['order_state'] = ORDER_STATE_PAY;
-                $data_order['payment_time'] = TIMESTAMP;
+                $data_order['payment_time'] = time();
                 $data_order['payment_code'] = 'predeposit';
                 $data_order['pd_amount'] = $order_amount;
                 $result = $model_order->editOrder($data_order,array('order_id'=>$order_info['order_id']));

+ 1 - 1
data/model/circle_member.model.php

@@ -66,7 +66,7 @@ class circle_memberModel extends Model {
      * @return boolean
      */
     public function addCircleMember($insert) {
-        $insert['cm_jointime'] = TIMESTAMP;
+        $insert['cm_jointime'] = time();
         $result = $this->insert($insert);
         if ($result) {
             dcache($insert['circle_id'], 'circle_managelist');

+ 1 - 1
data/model/consult.model.php

@@ -63,7 +63,7 @@ class consultModel extends Model{
      * @param unknown_type $input
      */
     public function editConsult($condition, $update){
-        $update['consult_reply_time'] = TIMESTAMP;
+        $update['consult_reply_time'] = time();
         return $this->where($condition)->update($update);
     }
 }

+ 3 - 3
data/model/goods.model.php

@@ -353,7 +353,7 @@ class goodsModel extends Model
             return true;
         }
         $condition['goods_id'] = array('in', $goodsid_array);
-        $update['goods_edittime'] = TIMESTAMP;
+        $update['goods_edittime'] = time();
         $result = $this->table('goods')->where($condition)->update($update);
         if ($result) {
             foreach ((array)$goodsid_array as $value) {
@@ -389,7 +389,7 @@ class goodsModel extends Model
             }
             foreach ($val as $k => $v) {
                 // 查询限时折扣时候进行
-                $xianshigoods = $model_xianshigoods->getXianshiGoodsInfo(array('goods_id' => $k, 'start_time' => array('lt', TIMESTAMP), 'end_time' => array('gt', TIMESTAMP)));
+                $xianshigoods = $model_xianshigoods->getXianshiGoodsInfo(array('goods_id' => $k, 'start_time' => array('lt', time()), 'end_time' => array('gt', time())));
                 if (!empty($xianshigoods)) {
                     // 更新价格
                     $this->editGoodsById(array('goods_promotion_price' => $xianshigoods['xianshi_price'], 'goods_promotion_type' => 2), $k);
@@ -1007,7 +1007,7 @@ class goodsModel extends Model
     public function getVirtualGoodsOnlineInfoByID($goods_id)
     {
         $goods_info = $this->getGoodsInfoByID($goods_id, '*');
-        return $goods_info['is_virtual'] == 1 && $goods_info['virtual_indate'] >= TIMESTAMP ? $goods_info : array();
+        return $goods_info['is_virtual'] == 1 && $goods_info['virtual_indate'] >= time() ? $goods_info : array();
     }
 
     /**

+ 7 - 7
data/model/member.model.php

@@ -287,7 +287,7 @@ class memberModel extends Model
         if (!empty($member_info['member_login_time'])) {
             $update_info = array(
                 'member_login_num' => ($member_info['member_login_num'] + 1),
-                'member_login_time' => TIMESTAMP,
+                'member_login_time' => time(),
                 'member_old_login_time' => $member_info['member_login_time'],
                 'member_login_ip' => getIp(),
                 'member_old_login_ip' => $member_info['member_login_ip']
@@ -384,7 +384,7 @@ class memberModel extends Model
             $insert['ac_des'] = '买家秀默认相册';
             $insert['ac_sort'] = 1;
             $insert['is_default'] = 1;
-            $insert['upload_time'] = TIMESTAMP;
+            $insert['upload_time'] = time();
             $this->table('sns_albumclass')->insert($insert);
 
             $member_info['member_id'] = $insert_id;
@@ -403,9 +403,9 @@ class memberModel extends Model
         $passwd = trim($param['member_passwd']);
         $member['member_passwd'] = empty($passwd) ? $passwd : md5($passwd);
 
-        $member['member_time'] = TIMESTAMP;
-        $member['member_login_time'] = TIMESTAMP;
-        $member['member_old_login_time'] = TIMESTAMP;
+        $member['member_time'] = time();
+        $member['member_login_time'] = time();
+        $member['member_old_login_time'] = time();
         $member['member_login_ip'] = getIp();
         $member['member_old_login_ip'] = $member['member_login_ip'];
 
@@ -433,9 +433,9 @@ class memberModel extends Model
                     $passwd = trim($param['member_passwd']);
                     $member_info['member_passwd'] = empty($passwd) ? $passwd : md5($passwd);
                 } elseif ($key == 'member_time') {
-                    $member_info['member_time'] = TIMESTAMP;
+                    $member_info['member_time'] = time();
                 } elseif ($key == 'member_login_time') {
-                    $member_info['member_login_time'] = TIMESTAMP;
+                    $member_info['member_login_time'] = time();
                 } elseif ($key == 'member_login_ip') {
                     $member_info['member_login_ip'] = getIp();
                 } else {

+ 2 - 2
data/model/order.model.php

@@ -373,7 +373,7 @@ class orderModel extends Model {
 	 */
 	public function addOrderLog($data) {
 	    $data['log_role'] = str_replace(array('buyer','seller','system','admin'),array('买家','商家','系统','管理员'), $data['log_role']);
-	    $data['log_time'] = TIMESTAMP;
+	    $data['log_time'] = time();
 	    return $this->table('order_log')->insert($data);
 	}
 
@@ -483,7 +483,7 @@ class orderModel extends Model {
 	       //买家投诉
 	       case 'complain':
 	           $state = in_array($order_info['order_state'],array(ORDER_STATE_PAY,ORDER_STATE_SEND)) ||
-	               intval($order_info['finnshed_time']) > (TIMESTAMP - C('complain_time_limit'));
+	               intval($order_info['finnshed_time']) > (time() - C('complain_time_limit'));
 	           break;
 
 	       case 'payment':

+ 3 - 3
data/model/p_xianshi.model.php

@@ -166,13 +166,13 @@ class p_xianshiModel extends Model{
      *
      */
     public function getXianshiExtendInfo($xianshi_info) {
-        if($xianshi_info['end_time'] > TIMESTAMP) {
+        if($xianshi_info['end_time'] > time()) {
             $xianshi_info['xianshi_state_text'] = $this->xianshi_state_array[$xianshi_info['state']];
         } else {
             $xianshi_info['xianshi_state_text'] = '已结束';
         }
 
-        if($xianshi_info['state'] == self::XIANSHI_STATE_NORMAL && $xianshi_info['end_time'] > TIMESTAMP) {
+        if($xianshi_info['state'] == self::XIANSHI_STATE_NORMAL && $xianshi_info['end_time'] > time()) {
             $xianshi_info['editable'] = true;
         } else {
             $xianshi_info['editable'] = false;
@@ -185,7 +185,7 @@ class p_xianshiModel extends Model{
      * 过期修改状态
      */
     public function editExpireXianshi($condition) {
-        $condition['end_time'] = array('lt', TIMESTAMP);
+        $condition['end_time'] = array('lt', time());
         
         // 更新商品促销价格
         $xianshigoods_list = Model('p_xianshi_goods')->getXianshiGoodsList($condition);

+ 6 - 6
data/model/p_xianshi_goods.model.php

@@ -169,8 +169,8 @@ class p_xianshi_goodsModel extends Model{
     public function getXianshiGoodsCommendList($count = 4) {
         $condition = array();
         $condition['state'] = self::XIANSHI_GOODS_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());
         $xianshi_list = $this->getXianshiGoodsExtendList($condition, null, 'xianshi_recommend desc', '*', $count);
         return $xianshi_list;
     }
@@ -186,14 +186,14 @@ class p_xianshi_goodsModel extends Model{
         $info = $this->_rGoodsXianshiCache($goods_id);
         if(empty($info)) {
             $condition['state'] = self::XIANSHI_GOODS_STATE_NORMAL;
-            $condition['end_time'] = array('gt', TIMESTAMP);
+            $condition['end_time'] = array('gt', time());
             $condition['goods_id'] = $goods_id;
             $xianshi_goods_list = $this->getXianshiGoodsExtendList($condition, null, 'start_time asc', '*', 1);
             $info['info'] = serialize($xianshi_goods_list[0]);
             $this->_wGoodsXianshiCache($goods_id, $info);
         }
         $xianshi_goods_info = unserialize($info['info']);
-        if (!empty($xianshi_goods_info) && ($xianshi_goods_info['start_time'] > TIMESTAMP || $xianshi_goods_info['end_time'] < TIMESTAMP)) {
+        if (!empty($xianshi_goods_info) && ($xianshi_goods_info['start_time'] > time() || $xianshi_goods_info['end_time'] < time())) {
             $xianshi_goods_info = array();
         }
         return $xianshi_goods_info;
@@ -220,8 +220,8 @@ class p_xianshi_goodsModel extends Model{
     private function _getXianshiGoodsListByGoods($goods_id_string) {
         $condition = array();
         $condition['state'] = self::XIANSHI_GOODS_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_id'] = array('in', $goods_id_string);
         $xianshi_goods_list = $this->getXianshiGoodsExtendList($condition, null, 'xianshi_goods_id desc', '*');
         return $xianshi_goods_list;

+ 1 - 1
mobile/control/crash_log.php

@@ -36,7 +36,7 @@ class crash_logControl extends mobileHomeControl
             }
 
             if (!is_dir($path)) mkdir($path);
-            $file_name = date('Ymd', TIMESTAMP) . '-' . random(4) . '.crash.log';
+            $file_name = date('Ymd', time()) . '-' . random(4) . '.crash.log';
             file_put_contents($path . $file_name, $crash_content, FILE_APPEND);
         } else {
             return joutput_error(errcode::ErrInputParam, '无crash内容');

+ 1 - 1
mobile/control/member_favorites.php

@@ -73,7 +73,7 @@ class member_favoritesControl extends mobileMemberControl {
 		$insert_arr['member_id'] = $this->member_info['member_id'];
 		$insert_arr['fav_id'] = $goods_id;
 		$insert_arr['fav_type'] = 'goods';
-		$insert_arr['fav_time'] = TIMESTAMP;
+		$insert_arr['fav_time'] = time();
 		$result = $favorites_model->addFavorites($insert_arr);
 
 		if ($result){

+ 1 - 1
mobile/control/member_feedback.php

@@ -27,7 +27,7 @@ class member_feedbackControl extends mobileMemberControl {
         $param = array();
         $param['content'] = $_POST['feedback'];
         $param['type'] = $this->member_info['client_type'];
-        $param['ftime'] = TIMESTAMP;
+        $param['ftime'] = time();
         $param['member_id'] = $this->member_info['member_id'];
         $param['member_name'] = $this->member_info['member_name'];