|
|
@@ -32,7 +32,8 @@ class GhsClass extends BaseClass
|
|
|
}
|
|
|
$ghsShop = ShopClass::getShopInfo($ghsShopId);
|
|
|
$ghsSjId = $ghsShop['sjId'] ?? 0;
|
|
|
- $name = $ghsShop['merchantName'] . ' ' . $ghsShop['shopName'];
|
|
|
+ $ghsDefault = $ghsShop['default'] ?? 0;
|
|
|
+ $name = $ghsDefault == 1 ? $ghsShop['merchantName'] : $ghsShop['merchantName'] . ' ' . $ghsShop['shopName'];
|
|
|
$py = stringUtil::py($name);
|
|
|
$ghShop = ShopClass::getShopInfo($hdShopId);
|
|
|
$hdSjId = $ghShop['sjId'] ?? 0;
|
|
|
@@ -56,7 +57,8 @@ class GhsClass extends BaseClass
|
|
|
];
|
|
|
$ghs = self::addGhs($data);
|
|
|
$shop = ShopClass::getShopInfo($hdShopId);
|
|
|
- $name = $shop['merchantName'] . ' ' . $shop['shopName'];
|
|
|
+ $default = $shop['default'] ?? 0;
|
|
|
+ $name = $default == 1 ? $shop['merchantName'] : $shop['merchantName'] . ' ' . $shop['shopName'];
|
|
|
$py = stringUtil::py($name);
|
|
|
$mobile = $shop['mobile'] ?? '';
|
|
|
$ghsId = $ghs['id'] ?? 0;
|
shish