|
|
@@ -5,6 +5,7 @@ namespace biz\ghs\classes;
|
|
|
use biz\shop\classes\ShopClass;
|
|
|
use biz\shop\services\ShopService;
|
|
|
use biz\sj\classes\MerchantAssetClass;
|
|
|
+use biz\sj\classes\SjClass;
|
|
|
use bizGhs\custom\classes\CustomClass;
|
|
|
use common\components\imgUtil;
|
|
|
use common\components\stringUtil;
|
|
|
@@ -32,7 +33,8 @@ class GhsClass extends BaseClass
|
|
|
}
|
|
|
$ghsShop = ShopClass::getShopInfo($ghsShopId);
|
|
|
$ghsSjId = $ghsShop['merchantId'] ?? 0;
|
|
|
- $name = $ghsShop['merchantName'] . ' ' . $ghsShop['shopName'];
|
|
|
+ $ghsSj = SjClass::getById($ghsSjId);
|
|
|
+ $name = $ghsSj['name'] . ' ' . $ghsShop['shopName'];
|
|
|
$py = stringUtil::py($name);
|
|
|
|
|
|
$ghShop = ShopClass::getShopInfo($hdShopId);
|
|
|
@@ -58,7 +60,9 @@ class GhsClass extends BaseClass
|
|
|
$ghs = self::addGhs($data);
|
|
|
|
|
|
$shop = ShopClass::getShopInfo($hdShopId);
|
|
|
- $name = $shop['merchantName'] . ' ' . $shop['shopName'];
|
|
|
+ $sjId = $shop['merchantId'] ?? 0;
|
|
|
+ $sj = SjClass::getById($sjId);
|
|
|
+ $name = $sj['name'] . ' ' . $shop['shopName'];
|
|
|
$py = stringUtil::py($name);
|
|
|
$mobile = $shop['mobile'] ?? '';
|
|
|
$ghsId = $ghs['id'] ?? 0;
|
shish