From edd4f5bef7ddd963fc8f1fb0f83dae28fc9a7c02 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 8 May 2024 11:39:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/order/OrderLogic.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

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);