|
|
@ -125,6 +125,7 @@ class OrderOnlineService implements OrderOnlineServiceInterface |
|
|
$userAddrAndDPrice = $this->userAddressService->getAddressAndDistributionPrice($userAddrId, $marketId); |
|
|
$userAddrAndDPrice = $this->userAddressService->getAddressAndDistributionPrice($userAddrId, $marketId); |
|
|
$userAddr = $userAddrAndDPrice['address']; |
|
|
$userAddr = $userAddrAndDPrice['address']; |
|
|
$deliveryAmount = $userAddrAndDPrice['distribution_price']; |
|
|
$deliveryAmount = $userAddrAndDPrice['distribution_price']; |
|
|
|
|
|
$deliveryDistance = $userAddrAndDPrice['delivery_distance']; |
|
|
// 优惠券数据,当前订单可用个优惠券
|
|
|
// 优惠券数据,当前订单可用个优惠券
|
|
|
$couponRecs = $this->couponRecService->allForOnlineOrderAvailable($userId, $marketId); |
|
|
$couponRecs = $this->couponRecService->allForOnlineOrderAvailable($userId, $marketId); |
|
|
$canRealUseCoupons = $couponRecs['available']; |
|
|
$canRealUseCoupons = $couponRecs['available']; |
|
|
@ -281,6 +282,7 @@ class OrderOnlineService implements OrderOnlineServiceInterface |
|
|
'services_money' => $serviceMoney, |
|
|
'services_money' => $serviceMoney, |
|
|
'coupon_money' => $couponMoney, |
|
|
'coupon_money' => $couponMoney, |
|
|
'delivery_money' => $deliveryAmount, |
|
|
'delivery_money' => $deliveryAmount, |
|
|
|
|
|
'delivery_distance' => $deliveryDistance, |
|
|
'state' => OrderState::UNPAID, |
|
|
'state' => OrderState::UNPAID, |
|
|
'tel' => $userAddr->tel, |
|
|
'tel' => $userAddr->tel, |
|
|
'address' => $userAddr->address.$userAddr->doorplate, |
|
|
'address' => $userAddr->address.$userAddr->doorplate, |
|
|
|