|
|
|
@ -1058,6 +1058,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository |
|
|
|
|
$rate = bcmul($merchantCart['merchantCategory']['commission_rate'], 100, 4); |
|
|
|
|
} |
|
|
|
|
$user_address = isset($address) ? ($address['province'] . $address['city'] . $address['district'] . $address['street'] . $address['detail']) : ''; |
|
|
|
|
|
|
|
|
|
//整理订单数据 |
|
|
|
|
$_order = [ |
|
|
|
|
'cartInfo' => $merchantCart, |
|
|
|
@ -1093,7 +1094,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository |
|
|
|
|
'coupon_price' => bcadd($merchantCart['order']['coupon_price'], $merchantCart['order']['platform_coupon_price'], 2), |
|
|
|
|
'platform_coupon_price' => $merchantCart['order']['platform_coupon_price'], |
|
|
|
|
'pay_type' => $pay_type, |
|
|
|
|
'user_address_id' => $user_address['address_id'] ?? 0, |
|
|
|
|
'user_address_id' => $address['address_id'] ?? 0, |
|
|
|
|
]; |
|
|
|
|
$allUseCoupon = array_merge($allUseCoupon, $merchantCart['order']['useCouponIds']); |
|
|
|
|
$orderList[] = $_order; |
|
|
|
|