diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index a52eb21..9e8606a 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -71,14 +71,7 @@ class OrderLogic extends BaseLogic static public function createOrder($cartId, $addressId, $user = null, $params = []) { $orderInfo = self::cartIdByOrderInfo($cartId, $addressId, $user, $params); - if($addressId>0){ - $address=UserAddress::where(['address_id'=>$addressId,'uid'=>Request()->userId])->find(); - if($address){ - $_order['real_name'] = $address['real_name']; - $_order['user_phone'] = $address['phone']; - $_order['user_address'] = $address['detail']; - } - } + $_order = $orderInfo['order']; $_order['deduction_price'] = 0; $_order['merchant'] = $params['mer_id']; @@ -89,6 +82,14 @@ class OrderLogic extends BaseLogic $_order['payinfo'] = ''; $_order['type'] = 0; $_order['actual'] = $_order['total']; + if($addressId>0){ + $address=UserAddress::where(['address_id'=>$addressId,'uid'=>Request()->userId])->find(); + if($address){ + $_order['real_name'] = $address['real_name']; + $_order['user_phone'] = $address['phone']; + $_order['user_address'] = $address['detail']; + } + } Db::startTrans(); try { $order = Cashierclass::create($_order);