城市

biz/merchant/classes/MerchantClass.php

@@ -136,7 +136,7 @@ class MerchantClass extends BaseClass
 			'addTime' => time(),
 		];
 		GoodsSettingClass::add($setData);
-		
+
 		//创建门店
 		$shopData = [
 			'shopName' => $merchant['merchantName'],

biz/saas/classes/ApplyClass.php

@@ -27,7 +27,8 @@ class ApplyClass extends BaseClass
 		if (!empty($apply)) {
 			util::fail('您已经申请过了');
 		}
-		$data['fullAddress'] = $data['province'] . $data['city'] . $data['dist'] . $data['address'] . $data['floor'];
+		$prefix = $data['province'] == $data['city'] ? $data['province'] : $data['province'] . $data['city'];
+		$data['fullAddress'] = $prefix . $data['dist'] . $data['address'] . $data['floor'];
 		return self::add($data);
 	}