From 363104650686abee4cbb86775b8648375eb2fb0c Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Tue, 21 May 2024 16:46:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86\=E7=BB=8F=E9=94=80?=
 =?UTF-8?q?=E5=95=86=E9=87=8D=E6=96=B0=E5=85=A5=E9=A9=BB=E6=97=B6=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/shop/IndexController.php | 37 +++++++++++++++------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/app/api/controller/shop/IndexController.php b/app/api/controller/shop/IndexController.php
index fb50fb3..bb6918c 100644
--- a/app/api/controller/shop/IndexController.php
+++ b/app/api/controller/shop/IndexController.php
@@ -45,17 +45,24 @@ class IndexController extends BaseApiController{
         $shop_user_id= $this->get_x_token();
         $post['shop_user_id']=$shop_user_id;
         $find=Db::name('user_auth_shop')->where('shop_uid',$post['shop_user_id'])->find();
-	    $city = Db::name('geo_city')->field('province_code,city_code')->where('city_name', 'like', '%' . $post['city_name'] . '%')->find();
-	    if(empty($city)){
-		    $post['province_id'] = '';
-		    $post['city_id'] = '';
-		    $post['area_id'] = '';
-	    }else{
-		    $post['province_id'] = $city['province_code'];
-		    $post['city_id'] = $city['city_code'];
-		    $area = Db::name('geo_area')->field('area_code')->where('city_code', $city['city_code'])->where('area_name', 'like', '%' . $post['area_name'] . '%')->find();
-		    $post['area_id'] = !empty($area) ? $area['area_code'] : '';
-	    }
+		if(!empty($post['city_name']) && !empty($post['area_name'])){
+			$city = Db::name('geo_city')->field('province_code,city_code')->where('city_name', 'like', '%' . $post['city_name'] . '%')->find();
+			if(empty($city)){
+				$post['province_id'] = '';
+				$post['city_id'] = '';
+				$post['area_id'] = '';
+			}else{
+				$post['province_id'] = $city['province_code'];
+				$post['city_id'] = $city['city_code'];
+				$area = Db::name('geo_area')->field('area_code')->where('city_code', $city['city_code'])->where('area_name', 'like', '%' . $post['area_name'] . '%')->find();
+				$post['area_id'] = !empty($area) ? $area['area_code'] : '';
+			}
+		}else{
+			$post['province_id'] = '';
+			$post['city_id'] = '';
+			$post['area_id'] = '';
+		}
+	    
         if($post['is_merchant_type']==1){
             if($find){
                 $res=MerchantLogic::edit($post);
@@ -124,6 +131,10 @@ class IndexController extends BaseApiController{
             $res=Merchant::where('mer_id',$id)->find();
             if($res){
                 $res['type_name']=DictData::where('type_value','merchat_type')->where('value',$res['type_id'])->value('name');
+				$city = Db::name('geo_city')->where('city_code',$res['city_id'])->find();
+	            $area = Db::name('geo_area')->where('area_code',$res['area_id'])->find();
+				$res['city_name'] = !empty($city) ? $city['city_name'] : '';
+				$res['area_name'] = !empty($area) ? $area['area_name'] : '';
             }
             return $this->success('ok',$res?->toArray());
         }
@@ -131,6 +142,10 @@ class IndexController extends BaseApiController{
             $res=Supplier::where('id',$id)->find();
             if($res){
                 $res['type_name']=DictData::where('type_value','merchat_type')->where('value',$res['type_id'])->value('name');
+	            $city = Db::name('geo_city')->where('city_code',$res['city_id'])->find();
+	            $area = Db::name('geo_area')->where('area_code',$res['area_id'])->find();
+	            $res['city_name'] = !empty($city) ? $city['city_name'] : '';
+	            $res['area_name'] = !empty($area) ? $area['area_name'] : '';
             }
             return $this->success('ok',$res?->toArray());
         }