Merge branch 'master' into dev

app-ghs/controllers/ConsoleController.php

@@ -173,7 +173,7 @@ class ConsoleController extends BaseController
         }
 
         //$notice[] = ['title' => '客户多个订单开始支持一键分享', 'action' => '查看', 'page' => '/admin/book/detail?id=calc'];
-        $notice[] = ['title' => '如果你发现一个问题很重要，一直没给你处理，多反应几次，用反应次数强调重要性，目前批发店多反应问题多。', 'action' => '', 'page' => ''];
+        $notice[] = ['title' => '如果你发现一个问题很重要，一直没给你处理，在小群多反应几次，用反应次数强调重要性，目前批发店多反应问题多，都在排队。', 'action' => '', 'page' => ''];
         //$notice[] = ['title' => '新功能：客户端和后台使用跑腿的流程', 'action' => '', 'page' => '/admin/book/detail?id=use_pt'];
         //$notice[] = ['title' => '分享订单打不开的解决办法', 'action' => '查看', 'page' => '/admin/book/detail?id=calc'];
 

common/components/delivery/services/DispatchService.php

@@ -435,7 +435,7 @@ class DispatchService
                 'addr_info' => [
                     [
                         'name' => $shop['merchantName'],
-                        'addr' => $shop['province'] . $shop['city'] . $shop['dist'] . $shop['address'],
+                        'addr' => $shop['fullAddress'],
                         'city_id' => $cityId,
                         'city_name' => $shop['city'],
                         'district_name' => $shop['dist'],
@@ -445,7 +445,7 @@ class DispatchService
                         'lat_lon' => ['lat' => (float)$shop['lat'], 'lon' => (float)$shop['long']],
                     ],
                     [
-                        'name' => $order['customName'],
+                        'name' => empty($order['showAddress']) ? $order['customName'] : $order['showAddress'],
                         'addr' => $order['fullAddress'],
                         'city_id' => $cityId,
                         'city_name' => $order['city'],
@@ -458,7 +458,7 @@ class DispatchService
                 ],
                 'vehicle_std' => $vehicleStd,
                 'spec_req' => array_values($specReq),
-                'coupon_id' => 123456, // TODO ??? 添加自动获取 coupon_id
+                //'coupon_id' => 0, // 优惠券信息，可以传指定券id，如果不传则会默认用最优券，如果不想用券则传0。下单时的券id需要和估价的策略一样，估价命中最优券，下单就必须传券id。不想用券就都传0
                 'invoice_type' => 1,
                 'order_service_type' => 1,
                 '_meta' => [