541469799@qq.com 1 год назад
Родитель
Сommit
84d8397905

+ 1 - 1
app/api/controller/Kuaidi.php

@@ -29,7 +29,7 @@ class Kuaidi extends Controller
         // 实例化快递100类
         $Kuaidi100 = new Kuaidi100($config['kuaidi100']);
         // 请求订阅接口
-        $list = $Kuaidi100->subscribe($arg['number'],$arg['type'] ?? 1,$arg['company']);
+        $list = $Kuaidi100->subscribe($arg['number'],$arg['type'] ?? 1,$arg['company'],$arg['phone']??'');
         return $this->renderSuccess(compact('list'));
     }
 

Разница между файлами не показана из-за своего большого размера
+ 5 - 0
app/api/controller/Test.php


+ 5 - 1
app/common/library/express/Kuaidi100.php

@@ -190,7 +190,7 @@ class Kuaidi100
      * @author: zjwhust
      * @Time: 2021/9/29 13:55
      */
-    public function subscribe($number,$type=1,$company){
+    public function subscribe($number,$type=1,$company='',$phone = null){
         $callbackurl = env('APP_URL').'/api/kuaidi/callback?type='.$type;
         $param = [
             'company' => $company??'',             //快递公司编码
@@ -211,6 +211,10 @@ class Kuaidi100
 //                'phone' => ''                 //手机号
             ]
         ];
+        if(!empty($phone)){
+            $param['parameters']['phone'] = $phone;
+        }
+        log_record('subscribeParam:'.json_encode($param));
         //请求参数
         $post_data = array();
         $post_data["schema"] = 'json';

+ 2 - 2
app/common/service/Kuaidi.php

@@ -24,7 +24,7 @@ use app\common\model\store\Setting as SettingModel;
 class Kuaidi extends BaseService
 {
     //订阅请求接口
-    public static function subscribe($expressNo, $type=1, $company=''){
+    public static function subscribe($expressNo, $type=1, $company='', $phone = ''){
         // 获取快递100配置项
         $config = SettingModel::getItem(SettingEnum::DELIVERY);
         if (empty($config['kuaidi100']['customer']) || empty($config['kuaidi100']['key'])) {
@@ -33,6 +33,6 @@ class Kuaidi extends BaseService
         // 实例化快递100类
         $Kuaidi100 = new Kuaidi100($config['kuaidi100']);
         // 请求订阅接口
-        return $Kuaidi100->subscribe($expressNo, $type, $company);
+        return $Kuaidi100->subscribe($expressNo, $type, $company, $phone);
     }
 }

+ 6 - 2
app/store/model/OrderGoods.php

@@ -380,11 +380,15 @@ class OrderGoods extends OrderGoodsModel
         if (!$this->verifyDelivery($orderGoods,$param)) {
             return false;
         }
+        $orderAddressM = new OrderAddressSimple();
+        $address = $orderAddressM->findByOrderId($orderGoods['order_id']);
+
         $express = ExpressModel::detail($param['express_id']);
         // 请求快递100订阅接口
-        $subscribe = KuaidiService::subscribe($param['express_no'],1,$express['kuaidi100_code']??'');
+        $subscribe = KuaidiService::subscribe($param['express_no'],1,$express['kuaidi100_code']??'',$address['phone'] ?? '');
+        log_record($param['express_no'].'----'.json_encode($subscribe));
         if(!$subscribe->result){
-            log_record($param['express_no'].'----'.json_encode($subscribe));
+            //log_record($param['express_no'].'----'.json_encode($subscribe));
             if(stripos($subscribe->message,"重复订阅") === false){ //重复订阅允许提交物流
                 $this->error = '物流单号订阅异常:'.$subscribe->message;
                 return false;

Некоторые файлы не были показаны из-за большого количества измененных файлов