Merge branch 'shish-cb' into dev

app-ghs/controllers/ExpressController.php

@@ -200,6 +200,7 @@ class ExpressController extends BaseController
         $receiverProvince = $custom->province;
         $receiverCity = $custom->city;
         $receiverAddress = $custom->address;
+        $receiverFloor = $custom->floor;
         $goodsName = '鲜花花材';
         $customRemark = '鲜花花材，编号：' . $order->sendNum;
         $goodsCount = ceil($order->itemNum);;
@@ -223,6 +224,7 @@ class ExpressController extends BaseController
             'receiverProvince' => $receiverProvince,
             'receiverCity' => $receiverCity,
             'receiverAddress' => $receiverAddress,
+            'receiverFloor' => $receiverFloor,
             'goodsCount' => $goodsCount,
             'goodsName' => $goodsName,
             'customRemark' => $customRemark,

biz-ghs/express/classes/ExpressClass.php

@@ -106,6 +106,7 @@ class ExpressClass extends BaseClass
         $receiverProvince = $params['receiverProvince'];
         $receiverCity = $params['receiverCity'];
         $receiverAddress = $params['receiverAddress'];
+        $receiverFloor = $params['receiverFloor'];
         $goodsCount = $params['goodsCount'];
         $goodsName = $params['goodsName'];
         $weight = $params['weight'];
@@ -145,7 +146,7 @@ class ExpressClass extends BaseClass
                 'mobile' => $receiverMobile, // 收件人手机号
                 'province' => $receiverProvince, // 收件人省份
                 'city' => $receiverCity, // 收件人城市
-                'address' => $receiverAddress, // 收件人详细地址
+                'address' => $receiverAddress . $receiverFloor, // 收件人详细地址
             ],
             // 商品信息
             'shop' => [