修改OMS调用接口为https类型

data/logic/delivery.logic.php

@@ -14,7 +14,7 @@ require_once (BASE_CORE_PATH . '/framework/function/http.php');
 
 class deliveryLogic
 {
-    const oms_url = 'http://oapi.lrlz.com/lrlzApiRest/router/rest';
+    const oms_url = 'https://oapi.lrlz.com/lrlzApiRest/router/rest';
     //const oms_url = 'http://oapitest.lrlz.com/lrlzApiRest/router/rest';
 
 

data/model/order.model.php

@@ -454,12 +454,11 @@ class orderModel extends Model
 
         if (!is_array($order_info) || empty($order_info)) return false;
 
-        switch ($operate) {
-
+        switch ($operate)
+        {
             //买家取消订单
         	case 'buyer_cancel':
-        	   $state = ($order_info['order_state'] == ORDER_STATE_NEW) ||
-        	       ($order_info['payment_code'] == 'offline' && $order_info['order_state'] == ORDER_STATE_PAY);
+        	   $state = ($order_info['order_state'] == ORDER_STATE_NEW) || ($order_info['payment_code'] == 'offline' && $order_info['order_state'] == ORDER_STATE_PAY);
         	   break;
 
     	   //申请退款

global.php

@@ -114,6 +114,9 @@ define('ORDER_STATE_CANCEL', 0);
 //已产生但未支付
 define('ORDER_STATE_NEW', 10);
 
+//已支付但是已支付但是未收到第三方确认回调未收到第三方确认回调
+//define('ORDER_STATE_PAY_UNCONFIRM', 15);
+
 //已支付
 define('ORDER_STATE_PAY', 20);
 

helper/order_helper.php

@@ -543,8 +543,7 @@ class order_action
         }
         $ret = $logic_order->changeOrderStateCancel($order_info,'buyer', $_SESSION['member_name']);
         if($ret['state']) {
-            QueueClient::push('onPredeposit',
-                array('change_type' => 'order_cancel','buyer_id'=>$order_info['buyer_id'],'order_sn'=>$order_info['order_sn']));
+            QueueClient::push('onPredeposit',array('change_type' => 'order_cancel','buyer_id'=>$order_info['buyer_id'],'order_sn'=>$order_info['order_sn']));
         } else {
             Log::record('用户取消订单失败SN:' . $order_info['order_sn'],Log::ERR);
         }

helper/pay_helper.php

@@ -9,7 +9,6 @@
 require_once (BASE_ROOT_PATH . "/helper/session_helper.php");
 require_once (BASE_ROOT_PATH . '/helper/bonus_helper.php');
 require_once (BASE_ROOT_PATH . '/helper/account_helper.php');
-
 require_once (BASE_ROOT_PATH . '/helper/pay/IPay.php');
 require_once (BASE_ROOT_PATH . '/helper/pay/alipay.php');
 require_once (BASE_ROOT_PATH . '/helper/pay/wxpay.php');