调试计算运费

app/ghs/controllers/ExpressController.php

@@ -41,7 +41,7 @@ class ExpressController extends BaseController
         $cargoInfo = ProductService::groupCargo($ghsItemInfo);
 
         $shop_order_id = time();
-        $shop_no = 1; //与快递签约时的门店ID（应该是固定的）
+        $shop_no = ""; //与快递签约时的门店ID（应该是固定的）
         $openid  = $this->admin['miniOpenId'];
 
         //客户id
@@ -68,8 +68,8 @@ class ExpressController extends BaseController
             'address'=>$post['receiveAddress']??'',
             'address_detail'=>$post['receiveFloor']??'',
             'phone'=>$customInfo['mobile']??'',
-            'lng'=>$post['receiveLong']??'',
-            'lat'=>$post['receiveLat']??'',
+            'lng'=>$post['receiveLong']??'118.134343',
+            'lat'=>$post['receiveLat']??'24.491566',
             'coordinate_type'=>0,
         ];
         $cargo = [
@@ -78,7 +78,9 @@ class ExpressController extends BaseController
             'cargo_first_class'=>'鲜花',
             'cargo_second_class'=>'鲜花',
         ];
-        $orderInfo = [];
+        $orderInfo = [
+            'is_direct_delivery'=>1,//设置应该为1,只能直拿直送
+        ];
         $shop = [
             'wxa_path'=>'/shop',
             'img_url'=>'http://www.baidu.com/test.png',

biz-ghs/express/services/MiniExpressService.php

@@ -52,11 +52,15 @@ class MiniExpressService
     ];
 
     //获取已支持的配送公司列表接口（改为查 数据库 xhExpress）
+    /*
+     * [{"delivery_id":"SFTC","delivery_name":"顺丰同城急送"},{"delivery_id":"SS","delivery_name":"闪送"},{"delivery_id":"MTPS","delivery_name":"美团配送"},{"delivery_id":"DADA","delivery_name":"达达"}]
+     */
     public static function getAllImmeDelivery()
     {
-//        $merchant = self::getGhsWxInfo();
-//        $res =  miniUtil::getAllImmeDelivery($merchant,2);
-//        self::handleReturn($res);
+        $merchant = self::getGhsWxInfo();
+        $res =  miniUtil::getAllImmeDelivery($merchant,2);
+        self::handleReturn($res);
+        return $res;
         $res = ExpressClass::getExpressAll("id,deliveryId,deliveryName");
         return $res;
     }
@@ -139,6 +143,7 @@ class MiniExpressService
         $appSecret = $expressData['appSecret'];//app_secrect
         $delivery_id = $expressData['deliveryId'];
         $delivery_sign = self::getDeliverySign($shopId,$appSecret,$shopOrderId);
+
         $data = [
             'shopid'=>$shopId,
             'shop_order_id'=>$orderSn,
@@ -338,8 +343,11 @@ class MiniExpressService
         $appSecret = $expressData['appSecret'];//app_secrect
         $delivery_id = $expressData['deliveryId'];
         $delivery_sign = self::getDeliverySign($shopId,$appSecret,$shopOrderId);
+        if(!$shopNo){
+            $shopNo = $expressData['shopNo'];
+        }
         $data = [
-            'shopid'=>$shopId,
+            'shopid'=>(string)$shopId,
             'shop_order_id'=>$orderSn,
             'shop_no'=>$shopNo,
             'delivery_sign'=>$delivery_sign, //delivery_sign=SHA1(shopid + shop_order_id + AppSecret)
@@ -351,10 +359,12 @@ class MiniExpressService
             'order_info'=>$orderInfo,
             'shop'=>$shop,
         ];
+
         if(empty($orderInfo)) {
             unset($data['order_info']);
         }
         $res =  miniUtil::preAddOrder($data,$merchant, 2);
+        dd($res);
         self::handleReturn($res);
         return $res;
     }