地址优化

app-hd/controllers/OrderController.php

@@ -657,12 +657,6 @@ class OrderController extends BaseController
         $reachPeriodId = $order['reachPeriod'];
         $reachPeriodArr = [0 => '上午', 1 => '下午', 2 => '晚上'];
         $reachPeriod = isset($reachPeriodArr[$reachPeriodId]) ? $reachPeriodArr[$reachPeriodId] : '';
-        $shopId = $order['shopId'];
-        $telephone = '';
-        if (!empty($shopId)) {
-            $shop = ShopService::getById($shopId);
-        }
-        $telephone = isset($shop['telephone']) ? $shop['telephone'] : '';
         $bookName = isset($order['bookName']) ? $order['bookName'] : '';
         $bookMobile = isset($order['bookMobile']) ? $order['bookMobile'] : '';
         if (isset($order['anonymity']) && $order['anonymity'] == 1) {

biz-ghs/merchant/classes/ShopClass.php

@@ -63,7 +63,7 @@ class ShopClass extends BaseClass
             util::fail('门店名称已经存在');
         }
         //补充fullAddress linqh 2021.4.18
-        $data['fullAddress'] = $data['province'] . $data['city'] . $data['address'] . $data['floor'];
+        $data['fullAddress'] = $data['city'] . $data['address'] . $data['floor'];
         $shop = self::add($data);
         $newShopId = $shop['id'];
         //初始化花材 linqh 2021.5.11

biz-ghs/order/classes/OrderClass.php

@@ -527,13 +527,12 @@ class OrderClass extends BaseClass
     //修改订单表的配送信息 linqh 2021.3.28
     public static function updateCustomExpressInfo($id, $expressAddInfo)
     {
-        $prefix = $expressAddInfo['province'] == $expressAddInfo['city'] ? $expressAddInfo['province'] : $expressAddInfo['province'] . $expressAddInfo['city'];
         $data = [
             'province' => $expressAddInfo['province'],
             'city' => $expressAddInfo['city'],
             'address' => $expressAddInfo['address'],
             'floor' => $expressAddInfo['floor'],
-            'fullAddress' => $prefix . $expressAddInfo['address'] . $expressAddInfo['floor'],
+            'fullAddress' => $expressAddInfo['city'] . $expressAddInfo['address'] . $expressAddInfo['floor'],
             'lat' => $expressAddInfo['lat'],
             'long' => $expressAddInfo['long'],
             'sendTime' => $expressAddInfo['sendTime'],

biz-hd/saas/classes/ApplyClass.php

@@ -72,11 +72,10 @@ class ApplyClass extends BaseClass
     //新增申请开店 ssh 2021.2.27
     public static function addRetail($data)
     {
-        $prefix = $data['province'] == $data['city'] ? $data['province'] : $data['province'] . $data['city'];
         $dist = $data['dist'] ?? '';
         $floor = $data['floor'] ?? '';
         $address = $data['address'] ?? '';
-        $data['fullAddress'] = $prefix . $dist . $address . $floor;
+        $data['fullAddress'] = $data['city'] . $dist . $address . $floor;
         $data['style'] = SjClass::STYLE_RETAIL;
         $respond = self::addApply($data);
         $mobile = $data['mobile'];
@@ -92,11 +91,10 @@ class ApplyClass extends BaseClass
     //新增申请开店 ssh 2021.2.27
     public static function addGhs($data)
     {
-        $prefix = $data['province'] == $data['city'] ? $data['province'] : $data['province'] . $data['city'];
         $dist = $data['dist'] ?? '';
         $floor = $data['floor'] ?? '';
         $address = $data['address'] ?? '';
-        $data['fullAddress'] = $prefix . $dist . $address . $floor;
+        $data['fullAddress'] = $data['city'] . $dist . $address . $floor;
         $data['style'] = SjClass::STYLE_SUPPLIER;
         $respond = self::addApply($data);
         $mobile = $data['mobile'];

biz-hd/saas/services/ApplyService.php

@@ -185,12 +185,10 @@ class ApplyService extends BaseService
                 $data['introShopId'] = $shopAdmin['shopId'] ?? 0;
             }
         }
-
-        $prefix = $data['province'] == $data['city'] ? $data['province'] : $data['province'] . $data['city'];
         $dist = $data['dist'] ?? '';
         $floor = $data['floor'] ?? '';
         $address = $data['address'] ?? '';
-        $data['fullAddress'] = $prefix . $dist . $address . $floor;
+        $data['fullAddress'] = $data['city'] . $dist . $address . $floor;
         $respond = ApplyClass::addGhs($data);
 
         //已提交开店申请，待审核

biz-mall/saas/classes/ApplyClass.php

@@ -33,10 +33,9 @@ class ApplyClass extends BaseClass
         if (!empty($shopAdmin)) {
             util::fail('您已经有门店了');
         }
-        $prefix = $data['province'] == $data['city'] ? $data['province'] : $data['province'] . $data['city'];
         $dist = isset($data['dist']) ? $data['dist'] : '';
         $floor = isset($data['floor']) ? $data['floor'] : '';
-        $data['fullAddress'] = $prefix . $dist . $data['address'] . $floor;
+        $data['fullAddress'] = $data['city'] . $dist . $data['address'] . $floor;
         $time = time();
         $data['addTime'] = $time;
         $mobile = $data['mobile'];
@@ -53,7 +52,6 @@ class ApplyClass extends BaseClass
             $agent->inviteNum += 1;
             $agent->save();
         }
-
         return self::add($data);
     }
 

biz/shop/classes/ShopClass.php

@@ -79,7 +79,7 @@ class ShopClass extends BaseClass
             util::fail('门店名称已经存在');
         }
         //补充fullAddress linqh 2021.4.18
-        $data['fullAddress'] = $data['province'] . $data['city'] . $data['address'] . $data['floor'];
+        $data['fullAddress'] = $data['city'] . $data['address'] . $data['floor'];
         $img = json_encode([]);
         if (isset($data['img']) && !empty($data['img'])) {
             $img = json_encode($data['img']);
@@ -110,11 +110,10 @@ class ShopClass extends BaseClass
         if (!empty($findShop) && $findShop['id'] != $id) {
             util::fail('门店名称已经存在');
         }
-        $prefix = $data['province'] == $data['city'] ? $data['province'] : $data['province'] . $data['city'];
         $dist = $data['dist'] ?? '';
         $floor = $data['floor'] ?? '';
         $address = $data['address'] ?? '';
-        $data['fullAddress'] = $prefix . $dist . $address . $floor;
+        $data['fullAddress'] = $data['city'] . $dist . $address . $floor;
         $respond = self::updateById($id, $data);
         $ptStyle = $shop['ptStyle'] ?? dict::getDict('ptStyle', 'hd');
         $default = $shop['default'] ?? 0;