合并分支 'wangxiaogang' 到 'master'

接收推送消息



查看合并请求 !43

@@ -57,8 +57,9 @@ class BirdController extends HomeBaseController
         $address = $addressModel->findData($where2);
         $address = $addressModel->findData($where2);
         $region = explode(' ',$address['region']);
         $region = explode(' ',$address['region']);
 
 
-        //请求url，接口正式地址：http://api.kdniao.com/api/eorderservice    测试环境地址：http://testapi.kdniao.com:8081/api/oorderservice
-        defined('ReqURL') or define('ReqURL', 'http://api.kdniao.com/api/OOrderService');
+        //请求url，接口正式地址：http://api.kdniao.com/api/OOrderService    测试环境地址：http://testapi.kdniao.com:8081/api/oorderservice
+        defined('ReqURL') or define('ReqURL', 'http://sandboxapi.kdniao.com:8080/kdniaosandbox/gateway/exterfaceInvoke.json');
+
 
 
         //构造在线下单提交信息
         //构造在线下单提交信息
         $eorder = [];
         $eorder = [];
@@ -152,8 +153,8 @@ class BirdController extends HomeBaseController
             $this->error('该订单不是已发货状态','','','');
             $this->error('该订单不是已发货状态','','','');
         }
         }
 
 
-        //请求url，接口正式地址：http://api.kdniao.com/api/eorderservice    测试环境地址：http://sandboxapi.kdniao.com:8080/kdniaosandbox/gateway/exterfaceInvoke.json
-        defined('ReqURL') or define('ReqURL', 'http://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx');
+        //请求url，接口正式地址：http://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx    测试环境地址：http://sandboxapi.kdniao.com:8080/kdniaosandbox/gateway/exterfaceInvoke.json
+        defined('ReqURL') or define('ReqURL', 'http://sandboxapi.kdniao.com:8080/kdniaosandbox/gateway/exterfaceInvoke.json');
 
 
         $jsonResult = $this->getOrderTracesByJson($indent['order_number'],$indent['logistic_code']);
         $jsonResult = $this->getOrderTracesByJson($indent['order_number'],$indent['logistic_code']);
         $result = json_decode($jsonResult,true);
         $result = json_decode($jsonResult,true);
@@ -210,8 +211,8 @@ class BirdController extends HomeBaseController
         $where2['id'] = ['eq',$indent['indent_address']];
         $where2['id'] = ['eq',$indent['indent_address']];
         $addressModel = new AddressModel();
         $addressModel = new AddressModel();
         $address = $addressModel->findData($where2);
         $address = $addressModel->findData($where2);
-        //请求url，接口正式地址：http://api.kdniao.com/api/eorderservice    测试环境地址：http://testapi.kdniao.com:8081/api/oorderservice
-        defined('ReqURL') or define('ReqURL', 'http://api.kdniao.com/api/dist');
+        //请求url，接口正式地址：http://api.kdniao.com/api/eorderservice    测试环境地址：http://sandboxapi.kdniao.com:8080/kdniaosandbox/gateway/exterfaceInv
+        defined('ReqURL') or define('ReqURL', 'http://sandboxapi.kdniao.com:8080/kdniaosandbox/gateway/exterfaceInv');
 
 
         $jsonResult = $this->orderTracesSubByJson($indent['order_number'],$indent['logistic_code'],$address);
         $jsonResult = $this->orderTracesSubByJson($indent['order_number'],$indent['logistic_code'],$address);
         $result = json_decode($jsonResult,true);
         $result = json_decode($jsonResult,true);