|
|
|
@ -12,6 +12,7 @@ use App\Constants\v3\Shipping; |
|
|
|
use App\Constants\v3\SsdbKeys; |
|
|
|
use App\Exception\ErrorCodeException; |
|
|
|
use App\Model\v3\Coupon; |
|
|
|
use App\Model\v3\Employees; |
|
|
|
use App\Model\v3\Goods; |
|
|
|
use App\Model\v3\GoodsActivity; |
|
|
|
use App\Model\v3\Market; |
|
|
|
@ -564,8 +565,9 @@ class OrderOnlineService implements OrderOnlineServiceInterface |
|
|
|
|
|
|
|
public function detailByUser($globalOrderId, $userId) |
|
|
|
{ |
|
|
|
|
|
|
|
//主订单
|
|
|
|
$orderMain = OrderMain::with(['market'])->where(['global_order_id' => $globalOrderId])->first(); |
|
|
|
//子订单
|
|
|
|
$orders = Order::query() |
|
|
|
->where(['order_main_id' => $globalOrderId, 'user_id' => $userId]) |
|
|
|
->with([ |
|
|
|
@ -573,8 +575,13 @@ class OrderOnlineService implements OrderOnlineServiceInterface |
|
|
|
'store' |
|
|
|
]) |
|
|
|
->get()->toArray(); |
|
|
|
|
|
|
|
return ['order_main' => $orderMain, 'orders' => $orders]; |
|
|
|
//配送人员信息
|
|
|
|
if($orderMain->horseman_id > 0) { |
|
|
|
$employees = Employees::query()->where('id', $orderMain->horseman_id)->first(); |
|
|
|
}else{ |
|
|
|
$employees = null; |
|
|
|
} |
|
|
|
return ['order_main' => $orderMain, 'orders' => $orders,'employees' => $employees]; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
|