xieruidong 2 years ago
parent
commit
07265ff056

+ 5 - 1
application/admin/controller/Orders.php

@@ -178,7 +178,7 @@ class Orders extends Backend
         if($this->request->isGet()){
             return $this->fetch();
         }else{
-            logistics()
+            list($isSuc,$data)=logistics()
                 ->setLogistics($order->logistics->com)
                 ->setUserName($order->address->name)
                 ->setPhone($order->address->mobile)
@@ -190,6 +190,10 @@ class Orders extends Backend
                 ->setCount($order->info()->sum('num'))
                 ->setOrderNo($order->order_no)
                 ->labelOrder();
+            if(!$isSuc){
+                $this->error($data);
+            }
+            $this->success();
         }
     }
 }

+ 2 - 0
application/common/model/OrderAddress.php

@@ -6,6 +6,8 @@ use think\Model;
 
 /**
  * @property string mobile
+ * @property string address
+ * @property string name
  */
 class OrderAddress extends Model
 {

+ 2 - 0
application/common/model/OrderLogistics.php

@@ -9,6 +9,8 @@ use think\Model;
  * @property LogisticsCompany com
  * @property string trans_no
  * @property string from_address
+ * @property string from_username
+ * @property string from_mobile
  */
 class OrderLogistics extends Model
 {

+ 13 - 2
extend/logistics/Kd100.php

@@ -102,6 +102,11 @@ class Kd100 extends QueryInterface{
     }
 
     public function labelOrder(){
+        $orderNo=$this->orderNo;
+        $dir=RUNTIME_PATH.'/miandan';
+        if(file_exists($dir."/{$orderNo}")){
+
+        }
         $params=[
             'printType'=>'IMAGE',
             'partnerId'=>config('site.kd100_lo_partnerId')?:'kd100',
@@ -137,10 +142,16 @@ class Kd100 extends QueryInterface{
         $body['sign']=md5(json_encode($params,256).$body['t'].$body['key'].$this->secret);
 
         $response=(new Client)->post('https://api.kuaidi100.com/label/order',[
-            'json'=>$body,
+            'form_params'=>$body,
             'http_errors'=>false,
         ]);
         $data=json_decode($response->getBody()->getContents(),true);
-        dd($data);
+        if(!isset($data['code'])){
+            return [false,'请求失败'];
+        }
+        if($data['code']!=200){
+            return [false,$data['message']];
+        }
+        return [true,$data['label']];
     }
 }