首店优化

app-ghs/controllers/ShopExtController.php

@@ -33,7 +33,7 @@ class ShopExtController extends BaseController
         $shopName = $shop->shopName ?? '';
         $sj = $this->sj;
         $sjName = $sj->name ?? '';
-        $name = $default == 1 ? $sjName : $sjName . ' ' . $shopName;
+        $name = $default == 1 && $shopName == '首店' ? $sjName : $sjName . ' ' . $shopName;
         if (!empty($printSn) && !empty($printKey)) {
             $print = new printUtil($printSn);
             $return = $print->addPrint($printKey, $name);

app-hd/controllers/GhsController.php

@@ -113,7 +113,7 @@ class GhsController extends BaseController
             $sjName = $shop['merchantName'] ?? '';
             $avatar = $shop['avatar'] ?? '';
             $default = $shop['default'] ?? 0;
-            $name = $default == 1 ? $sjName : $sjName . ' ' . $shopName;
+            $name = $default == 1 && $shopName =='首店' ? $sjName : $sjName . ' ' . $shopName;
             $ghs = [
                 'id' => 0,
                 'name' => $name,

app-hd/controllers/ShopExtController.php

@@ -82,7 +82,7 @@ class ShopExtController extends BaseController
         $shopName = $shop->shopName ?? '';
         $sj = $this->sj;
         $sjName = $sj->name ?? '';
-        $name = $default == 1 ? $sjName : $sjName . ' ' . $shopName;
+        $name = $default == 1 && $shopName == '首店' ? $sjName : $sjName . ' ' . $shopName;
         if (!empty($printSn) && !empty($printKey)) {
             $print = new printUtil($printSn);
             $return = $print->addPrint($printKey, $name);
@@ -142,7 +142,7 @@ class ShopExtController extends BaseController
         $shopName = $shop->shopName ?? '';
         $sj = $this->sj;
         $sjName = $sj->name ?? '';
-        $name = $default == 1 ? $sjName : $sjName . ' ' . $shopName;
+        $name = $default == 1 && $shopName == '首店' ? $sjName : $sjName . ' ' . $shopName;
         if (!empty($printSn) && !empty($printKey)) {
             $print = new printUtil($printSn);
             $return = $print->addPrint($printKey, $name);
@@ -202,7 +202,7 @@ class ShopExtController extends BaseController
         $shopName = $shop->shopName ?? '';
         $sj = $this->sj;
         $sjName = $sj->name ?? '';
-        $name = $default == 1 ? $sjName : $sjName . ' ' . $shopName;
+        $name = $default == 1 && $shopName == '首店' ? $sjName : $sjName . ' ' . $shopName;
         if (!empty($printSn) && !empty($printKey)) {
             $print = new printUtil($printSn);
             $return = $print->addPrint($printKey, $name);

app-mall/controllers/OrderController.php

@@ -284,7 +284,7 @@ class OrderController extends BaseController
         $sjName = $shop['merchantName'] ?? '';
         $shopName = $shop['shopName'] ?? '';
         $default = $shop['default'] ?? 0;
-        $shop['showName'] = $default == 1 ? $sjName : $sjName . ' ' . $shopName;
+        $shop['showName'] = $default == 1 && $shopName=='首店' ? $sjName : $sjName . ' ' . $shopName;
 
         $freight = ['first' => 5, 'add' => 2];
         $mapKey = 'OFWBZ-2NTHP-EHNDD-LKWQY-GANM7-PXBJH';

biz/ghs/classes/GhsClass.php

@@ -51,7 +51,7 @@ class GhsClass extends BaseClass
         $allowDebt = $ghsShop['allowDebt'] ?? 0;
         $allowDebtAmount = $ghsShop['allowDebtAmount'] ?? 5000;
 
-        $name = $ghsDefault == 1 ? $ghsShop['merchantName'] : $ghsShop['merchantName'] . ' ' . $ghsShop['shopName'];
+        $name = $ghsDefault == 1 && $ghsShop['shopName'] == '首店' ? $ghsShop['merchantName'] : $ghsShop['merchantName'] . ' ' . $ghsShop['shopName'];
         $py = stringUtil::py($name);
         $hdShopInfo = ShopClass::getShopInfo($hdShopId);
         $hdSjId = $hdShopInfo['sjId'] ?? 0;
@@ -82,7 +82,7 @@ class GhsClass extends BaseClass
         $shop = ShopClass::getShopInfo($hdShopId);
         $hdAvatar = $shop['shortAvatar'] ?? '';
         $default = $shop['default'] ?? 0;
-        $name = $default == 1 ? $shop['merchantName'] : $shop['merchantName'] . ' ' . $shop['shopName'];
+        $name = $default == 1 && $shop['shopName'] == '首店' ? $shop['merchantName'] : $shop['merchantName'] . ' ' . $shop['shopName'];
 
         //从分店同步客户，客户被修改的名称也要同步过来
         $firstName = empty($changeName) ? $name : $changeName;

biz/pt/classes/PtAssetClass.php

@@ -91,7 +91,7 @@ class PtAssetClass extends BaseClass
             $txAsset->save();
         }
         $sjName = $shop->merchantName ?? '';
-        if (isset($shop->default) == false || $shop->default != 1) {
+        if (isset($shop->default) == false || $shop->default != 1 || $shop->shopName != '首店') {
             $sjName .= ' ' . $shop->shopName;
         }
 
@@ -317,7 +317,7 @@ class PtAssetClass extends BaseClass
         }
 
         $merchantName = $shop->merchantName ?? '';
-        if ($shop->default != 1) {
+        if ($shop->default != 1 || $shop->shopName != '首店') {
             $shopName = $shop->shopName ?? '';
             $merchantName = $merchantName . '-' . $shopName;
         }

biz/shop/classes/ShopClass.php

@@ -135,7 +135,7 @@ class ShopClass extends BaseClass
         $default = $shop['default'] ?? 0;
         $sjName = $shop['merchantName'] ?? '';
         //默认门店只显示商家名称即可
-        $name = $default == 1 ? $sjName : $sjName . ' ' . $shopName;
+        $name = $default == 1 && $shopName=='首店' ? $sjName : $sjName . ' ' . $shopName;
         $shopUpdate = [
             'name' => $name,
             'mobile' => $data['mobile'] ?? '',