From 3d7d447c7d1effd722a97e776322aa260c677347 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 27 Jul 2024 14:56:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BB=A5=E5=A4=84=E7=90=86=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index c90bd959..441ef61d 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -231,7 +231,7 @@ class OrderLogic extends BaseLogic
                     $store_id = getenv('STORE_ID') ?? 1;
                     $store['near_store'] = SystemStore::where('id', $store_id)->field('id,name,phone,address,detailed_address,latitude,longitude')->find() ?? [];
                 }
-                $order['address_id'] = UserAddress::where('uid', $user['id'])->where('is_default', 1)->value('id')??0;
+                $order['address_id'] = UserAddress::where('uid', $user['id'])->where('is_default', 1)->value('id') ?? 0;
             }
             if (empty($store_check)) {
                 if ((isset($params['lat']) && $params['lat'] != '') && (isset($params['long']) && $params['long'] != '')) {
@@ -292,12 +292,25 @@ class OrderLogic extends BaseLogic
         //     $_order['reservation_time'] = $params['reservation_time'];
         //     $_order['reservation'] = YesNoEnum::YES;
         // }
-        if ($addressId > 0 && $uid > 0) {
-            $address = UserAddress::where(['id' => $addressId, 'uid' => $uid])->find();
+        if ($uid > 0) {
+            $address = UserAddress::where(['uid' => $uid])->find();
             if ($address) {
                 $_order['real_name'] = $address['real_name'];
                 $_order['user_phone'] = $address['phone'];
-                $_order['user_address'] = $address['detail'];
+                if ($address['area']) {
+                    $_order['user_address'] = Db::name('geo_area')->where('area_code', $address['area'])->value('area_name') ?? '';
+                }
+                if ($address['street']) {
+                    $street_name = Db::name('geo_street')->where('street_code', $address['street'])->value('street_name') ?? '';
+                    $_order['user_address'] .= '/' . $street_name;
+                }
+                if ($address['village']) {
+                    $village_name = Db::name('geo_village')->where('village_code', $address['village'])->value('village_name') ?? '';
+                    $_order['user_address'] .=  '/' . $village_name;
+                }
+                if ($address['brigade']) {
+                    $_order['user_address'] .= '/' .  $address['brigade'] ?? $address['brigade'] . '队' : '';
+                }
             }
         }
         if ($params['shipping_type'] == 2) {
@@ -577,7 +590,7 @@ class OrderLogic extends BaseLogic
                 'staff_id' => $params['staff_id'] ?? 0,
             ], ['id' => $order['id']]);
             //修改商品统计记录标识
-            (new StoreProductLog())->where('oid',$order['id'])->update(['store_id' => $params['store_id']]);
+            (new StoreProductLog())->where('oid', $order['id'])->update(['store_id' => $params['store_id']]);
             (new StoreOrderCartInfo())->update([
                 'verify_code' => $params['verify_code'] . '-1',
                 'writeoff_time' => time(),
@@ -587,9 +600,9 @@ class OrderLogic extends BaseLogic
                 'update_time' => time(),
             ], ['oid' => $order['id']]);
             $financeFlow = new StoreFinanceFlow();
-            $res=$financeFlow->where('order_id',$order['id'])->update(['store_id'=>$params['store_id'],'staff_id'=>$params['staff_id']]);
-            if($res){
-                $order['store_id']=$params['store_id'];
+            $res = $financeFlow->where('order_id', $order['id'])->update(['store_id' => $params['store_id'], 'staff_id' => $params['staff_id']]);
+            if ($res) {
+                $order['store_id'] = $params['store_id'];
             }
             $financeFlowLogic = new StoreFinanceFlowLogic();
             $select_1 = $financeFlow->where(['order_id' => $order['id'], 'financial_pm' => 1, 'financial_type' => ['in' => 14, 15, 16]])->select();