|
|
@@ -1179,7 +1179,7 @@ class StoreOrder extends BaseController
|
|
1179
|
1179
|
return app('json')->fail('订单未发货');
|
|
1180
|
1180
|
$merchantRepository = app()->make(MerchantRepository::class);
|
|
1181
|
1181
|
$order['mer_service_phone'] = $merchantRepository->get($order['mer_id'])['mer_phone'] ?? '';
|
|
1182
|
|
- $express = ExpressService::express($order->delivery_id);
|
|
|
1182
|
+ $express = ExpressService::express($order->delivery_id,$order->delivery_type);
|
|
1183
|
1183
|
$order->append(['orderProduct']);
|
|
1184
|
1184
|
return app('json')->success(compact('express', 'order'));
|
|
1185
|
1185
|
}
|