From 90b2fde000a570727907f2e1af42e77aa2a01082 Mon Sep 17 00:00:00 2001
From: xucong <850806214@qq.com>
Date: Thu, 4 Sep 2025 17:55:15 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8F=90=E4=BA=A4=E7=BC=BA=E5=A4=B1=E7=9A=84?=
 =?UTF-8?q?=E4=B8=9C=E8=A5=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/api/logic/OrderLogic.php b/app/api/logic/OrderLogic.php
index 546cf4a..18f7ec9 100644
--- a/app/api/logic/OrderLogic.php
+++ b/app/api/logic/OrderLogic.php
@@ -516,7 +516,7 @@ class OrderLogic extends LogicBase
             $type = $post['type'] ?? '';
             $order_source = $post['client'];
             $goods_lists = $data['goods_lists'];
-            $user_address = $data['address'];
+//            $user_address = $data['address'];
             $user = User::find($user_id);
 
 //            if ($post['delivery_type'] != CommonOrder::DELIVERY_STATUS_SELF && empty($data['address'])) {
@@ -611,7 +611,7 @@ class OrderLogic extends LogicBase
                 'consignee'=>($post['delivery_type'] == CommonOrder::DELIVERY_STATUS_SELF) ? $post['consignee'] : '',
                 'mobile'=>($post['delivery_type'] == CommonOrder::DELIVERY_STATUS_SELF) ? $post['mobile'] : ''
             ];
-            $order = self::addOrder($user_id, $data,$post, $order_source, $user_address, $extra);
+            $order = self::addOrder($user_id, $data,$post, $order_source, $user_address="", $extra);
             $order_id = $order['order_id'];
             self::addOrderGoods($order_id, $goods_lists);
             self::addOrderAfter($order_id, $user_id, $type, $data);
@@ -694,12 +694,12 @@ class OrderLogic extends LogicBase
                 'order_sn'         => createSn('order', 'order_sn', '', 4),
                 'user_id'          => $user_id,
                 'order_source'     => $order_source,
-                'consignee'        => $user_address['contact'],
-                'province'         => $user_address['province_id'],
-                'city'             => $user_address['city_id'],
-                'district'         => $user_address['district_id'],
-                'address'          => $user_address['address'],
-                'mobile'           => $user_address['telephone'],
+//                'consignee'        => $user_address['contact'],
+//                'province'         => $user_address['province_id'],
+//                'city'             => $user_address['city_id'],
+//                'district'         => $user_address['district_id'],
+//                'address'          => $user_address['address'],
+//                'mobile'           => $user_address['telephone'],
                 'goods_price'      => $data['total_goods_price'],
                 'order_amount'     => $data['order_amount'],//应付金额
                 'total_amount'     => $data['total_amount'],//订单总金额