|
|
@@ -46,7 +46,7 @@ class GhsClass extends BaseClass
|
|
|
$ghsShop = ShopClass::getShopInfo($ghsShopId);
|
|
|
$ghsSjId = $ghsShop['sjId'] ?? 0;
|
|
|
$ghsMainId = $ghsShop['mainId'] ?? 0;
|
|
|
- $ghsAvatar = $ghsShop['avatar']??'';
|
|
|
+ $ghsAvatar = $ghsShop['avatar'] ?? '';
|
|
|
$ghsDefault = $ghsShop['default'] ?? 0;
|
|
|
$name = $ghsDefault == 1 ? $ghsShop['merchantName'] : $ghsShop['merchantName'] . ' ' . $ghsShop['shopName'];
|
|
|
$py = stringUtil::py($name);
|
|
|
@@ -63,7 +63,7 @@ class GhsClass extends BaseClass
|
|
|
'ownMainId' => $hdMainId,
|
|
|
'name' => $name,
|
|
|
'py' => $py,
|
|
|
- 'avatar'=>$ghsAvatar,
|
|
|
+ 'avatar' => $ghsAvatar,
|
|
|
'mobile' => $ghsShop['mobile'] ?? '',
|
|
|
'province' => $ghsShop['province'] ?? '',
|
|
|
'city' => $ghsShop['city'] ?? '',
|
|
|
@@ -77,7 +77,6 @@ class GhsClass extends BaseClass
|
|
|
$ghs = self::addGhs($data);
|
|
|
$ghsId = $ghs['id'] ?? 0;
|
|
|
$shop = ShopClass::getShopInfo($hdShopId);
|
|
|
- $hdAvatar = $shop['avatar']??'';
|
|
|
$default = $shop['default'] ?? 0;
|
|
|
$name = $default == 1 ? $shop['merchantName'] : $shop['merchantName'] . ' ' . $shop['shopName'];
|
|
|
|
|
|
@@ -108,7 +107,6 @@ class GhsClass extends BaseClass
|
|
|
'name' => $firstName,
|
|
|
'originName' => $secondName,
|
|
|
'py' => $py,
|
|
|
- 'avatar'=>$hdAvatar,
|
|
|
'mobile' => $mobile,
|
|
|
'province' => $shop['province'] ?? '',
|
|
|
'city' => $shop['city'] ?? '',
|
