Merge branch 'goods' of 121.43.114.153:/home/git/repositories/shopnc into goods

data/logic/delivery.logic.php

@@ -26,6 +26,11 @@ class deliveryLogic
 
     public function putOrder($pay_sn, $trade_no)
     {
+        // 调试模式下不能推送到oms
+        if(defined('DEBUG_MODE') && DEBUG_MODE == true) {
+            return null;
+        }
+
         $order_list = Model('order')->getNormalOrderList(array('pay_sn'=> $pay_sn), $this->page, '*', 'order_id desc', '', array('order_address', 'order_goods'));
         $delivery_order_list = array();
         foreach ($order_list as $order_info)

helper/func.php

@@ -10,7 +10,7 @@ class func
 {
 
     const auth_code_expire = 5;   // 单位：分钟
-    const token_expire = 3;     // 单位：分钟
+    const token_expire = 1200;     // 单位：分钟
 
     // 生成验证码key
     public static function gen_auth_code_key($mobile)