From 39fe3be35dd37b8a9657c628022457866a5099b7 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Thu, 14 Sep 2023 13:02:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=95=86=E6=88=B7=E5=85=A5?=
 =?UTF-8?q?=E9=A9=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/store/merchant/MerchantIntention.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php
index d6f78d9d..3d859e62 100644
--- a/app/controller/api/store/merchant/MerchantIntention.php
+++ b/app/controller/api/store/merchant/MerchantIntention.php
@@ -138,17 +138,15 @@ class MerchantIntention extends BaseController
             ]
         ]);
         $areaInfo = Db::name('geo_area')->where('area_code', $data['area_id'] ?? '')->find();
-        $cityId   = Db::name('geo_city')->where('city_code', $areaInfo['city_code'] ?? '')->value('city_id', 0);
-        $streetId = Db::name('geo_street')->where('street_code', $data['street_id'] ?? '')->value('street_id', 0);
         $sendData = [
             'company_name' => $data['mer_name'],
             'organization_code' => $data['social_credit_code'] ?? '',
             'master_name' => $data['name'],
             'master_phone' => $data['phone'],
             'images' => !empty($data['images'])?json_encode($data['images']):'',
-            'city' => $cityId,
-            'area' => $areaInfo['area_id'] ?? 0,
-            'street' =>  $streetId,
+            'city' => $areaInfo['city_code'] ?? '',
+            'area' => $data['area_id'] ?? '',
+            'street' =>  $data['street_id'] ?? '',
             'mer_intention_id' =>  $id
         ];
         $res = $this->sendMerIntentionApply($sendData);