king 4 лет назад
Родитель
Сommit
49e548c22a
2 измененных файлов с 10 добавлено и 10 удалено
  1. 8 10
      app/Services/DbOpenService.php
  2. 2 0
      config/api_logistic.php

+ 8 - 10
app/Services/DbOpenService.php

@@ -21,7 +21,7 @@ class DbOpenService
      * 创建德邦订单,生成快递单号
      * @param array $params
      */
-    public function getDbOrderNo($params = [])
+    public function getDbOrderNo(array $params = []):array
     {
         //获取系统无快递单号订单信息
         $order_info = Waybill::query()
@@ -33,7 +33,6 @@ class DbOpenService
             ->first();
         //请求德邦API 生成新订单
         $model = new OrderLogistic();
-        $uri = "http://dpsanbox.deppon.com/sandbox-web/dop-standard-ewborder/createOrderNotify.action";
         $header = [
             'Content-Type' => 'application/x-www-form-urlencoded;charset=utf-8',
             "Accept" => "application/json"
@@ -108,18 +107,18 @@ class DbOpenService
                         'key' => ''
                     ]
                 ];
-                $param = json_encode($data, true);
+                $param = json_encode($data,1);
                 $dd["params"] = $param;
                 $dd["timestamp"] = (integer)getMillisecond();
                 $dd["digest"] = base64_encode(md5($param . config('api_logistic.DB.prod.app_key') . $dd['timestamp']));
                 $dd["companyCode"] = config('api_logistic.DB.prod.company_code');
-                $return = httpPost($uri, $dd, $header);
+                $return = httpPost(config('api_logistic.DB.prod.uri')['create_order'], $dd, $header);
                 unset($data);
+                $id = $params['id'];
+                $order_no = $order_info->wms_bill_number;
                 if (array_key_exists('result', $return)) {
                     //请求成功  快递单号 $return['mailNo']   请求编号 $return['uniquerRequestNumber']
                     //返回日志记录
-                    $id = $params['id'];
-                    $order_no = $order_info->wms_bill_number;
                     $mail_no = $return['mailNo']??'';
                     $add_data = [
                         'order_id' => $order_info->order->id,
@@ -159,10 +158,9 @@ class DbOpenService
      * @param array $params
      * @return array
      */
-    public function getOrderStatus($params = [])
+    public function getOrderStatus(array $params = []):array
     {
         if ( ($params['mailNo']??'') == '') return ['code' => 0 , 'msg' => '德邦运单号不能为空'];
-        $uri = "http://dpsanbox.deppon.com/sandbox-web/standard-order/newTraceQuery.action";
         $header = [
             'Content-Type' => 'application/x-www-form-urlencoded;charset=utf-8',
             "Accept" => "application/json"
@@ -170,12 +168,12 @@ class DbOpenService
         $data = [
             'mailNo' => $params['mailNo']??''
         ];
-        $param = json_encode($data, true);
+        $param = json_encode($data, 1);
         $dd["params"] = $param;
         $dd["timestamp"] = (integer)getMillisecond();
         $dd["digest"] = base64_encode(md5($param . config('api_logistic.DB.prod.app_key') . $dd['timestamp']));
         $dd["companyCode"] = config('api_logistic.DB.prod.company_code');
-        $return = httpPost($uri, $dd, $header);
+        $return = httpPost(config('api_logistic.DB.prod.uri')['order_locus'], $dd, $header);
         if (array_key_exists('result', $return) && $return['result'] == 'true' && array_key_exists('resultCode', $return) && $return['resultCode'] == '1000'){
            return ['code'=> 1, 'msg'=> '正在加载中。。。', 'data' => $return['responseParam']];
         }

+ 2 - 0
config/api_logistic.php

@@ -183,6 +183,7 @@ return [
             'passwordSigning' => 'N', //是否口令签收 仅适用于快递,Y:需要 N: 不需要;若为Y,必须收货人提供验证码给快递员才能签收,该服务是有偿的,具体费用请让我司收货营业部联系张宁(491407),请慎重使用!
             'uri' => [
                 'create_order' => 'http://dpsanbox.deppon.com/sandbox-web/dop-standard-ewborder/createOrderNotify.action',
+                'order_locus' => 'http://dpsanbox.deppon.com/sandbox-web/standard-order/newTraceQuery.action',
             ]
         ],
         'prod'=>[
@@ -200,6 +201,7 @@ return [
             'passwordSigning' => 'N', //是否口令签收 仅适用于快递,Y:需要 N: 不需要;若为Y,必须收货人提供验证码给快递员才能签收,该服务是有偿的,具体费用请让我司收货营业部联系张宁(491407),请慎重使用!
             'uri' => [
                 'create_order' => 'http://dpsanbox.deppon.com/sandbox-web/dop-standard-ewborder/createOrderNotify.action',
+                'order_locus' => 'http://dpsanbox.deppon.com/sandbox-web/standard-order/newTraceQuery.action',
             ]
         ]
     ],