bugs

application/common.php

@@ -540,6 +540,7 @@ function tm(){
         $key = config('site.tmap_key');
         $ins = TencentMap::instance();
         $ins->setKey($key);
+        $ins->setSecretKey(config('site.tmap_sk'));
     }
     return $ins;
 }

application/extra/site.php

@@ -45,7 +45,7 @@ return array (
   'mch_secret' => '9e88d4f48881fe3e3deb09f9f430a589',
   'order_refund_land' => '20',
   'order_refund_air' => '30',
-  'tmap_key' => 'YV7BZ-7IFWV-GWDPV-U2C5Q-2XNT5-MNBY6',
+  'tmap_key' => 'ZFNBZ-D47W3-KUD33-3U2RB-T6IQT-ODFJ5',
   'mch_key' => '-----BEGIN PRIVATE KEY-----
 MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDcZuUxYGpVezLZ
 weZH0GDvAxcrB6iU1gkfIuubPb5ocLU+dxazmWc92Em95mZNLW38OisDDoY6744i
@@ -100,4 +100,5 @@ TUerZQ+xwiKFEk5f6TVGjCYhEb5Yj3JGklb3VzcEjtf/BNNVY7qQUORVcbWnpel6
 -----END CERTIFICATE-----',
   'settle_type' => '1',
   'basic_ordered_notify_admin' => '',
+  'tmap_sk' => '0fPif5Ffx2w8NRy4wieGKYIlqj50IHJP',
 );

application/index/controller/Index.php

@@ -18,6 +18,7 @@ class Index extends Frontend
     {
         return $this->view->fetch();
     }
-    public function test(UserOrderService $orderService){
+    public function test(){
+        //dd(tm()->getDistance(['117.362305',39.131073],[116.42705,39.9028]));
     }
 }

application/service/UserOrderService.php

@@ -106,12 +106,19 @@ class UserOrderService{
     }
 
     protected function distance(){
-        $this->order['distance']=ll_distance(
-            $this->order['from_longitude'],
-            $this->order['from_latitude'],
-            $this->order['to_longitude'],
-            $this->order['to_latitude']
-        );
+        if($this->order['freight']=='air') {
+            $this->order['distance'] = ll_distance(
+                $this->order['from_longitude'],
+                $this->order['from_latitude'],
+                $this->order['to_longitude'],
+                $this->order['to_latitude']
+            );
+        }else{
+            $this->order['distance']=tm()->getDistance(
+                [$this->order['from_longitude'],$this->order['from_latitude']],
+                [$this->order['to_longitude'],$this->order['to_latitude']]
+            );
+        }
         $this->recordLog("距离：{$this->order['distance']}km");
     }
 

extend/TencentMap.php

@@ -7,6 +7,7 @@ use traits\think\Instance;
 class TencentMap{
     use Instance;
     protected $key;
+    protected $secretKey;
 
     /**
      * @return mixed
@@ -39,6 +40,42 @@ class TencentMap{
         ];
     }
 
+    public function getDistance($from,$to){
+        $query=$this->query([
+            'from'=>implode(',',array_reverse($from)),
+            'to'=>implode(',',array_reverse($to)),
+        ]);
+        $res=self::client()->get('https://apis.map.qq.com/ws/direction/v1/driving',[
+            'query'=>$query+['sig'=>$this->getSign('/ws/direction/v1/driving',$query)]
+        ]);
+        $res=$this->result($res);
+        return [
+            'distance'=>bcdiv($res['routes'][0]['distance'],1000),
+        ];
+    }
+
+    protected function getSign($uri,$query){
+        ksort($query);
+        $str=sprintf("%s?%s",$uri,$this->buildQuery($query));
+        return md5($str);
+    }
+
+    protected function buildQuery($query){
+        $data=[];
+        foreach ($query as $key=>$value){
+            $data[]=sprintf("%s=%s",$key,$value);
+        }
+        return implode('&',$data).$this->secretKey;
+    }
+
+    /**
+     * @param mixed $secretKey
+     */
+    public function setSecretKey($secretKey): void
+    {
+        $this->secretKey = $secretKey;
+    }
+
     public static function client(){
         static $client;
         if(!$client){